Update Jenkins Job Builder to version 2.9.1

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-verify-jobs.yaml

diff --git a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
index ee06cea78b38487002127c76ba5ceed4f0894468..d1575094d85ef470f44f0b8cc82055d22ae13d7f 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -58,12 +58,13 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'cloud-infra-vpod-ubuntu1604-xerces'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
+          default: 'cloud-infra-vpod'
       - string:
           name: DISTRO
           default: '{distro}'
+      - string:
+          name: CLEANUP
+          default: 'true'
 
     properties:
       - logrotate
@@ -80,8 +81,6 @@
           option: project
 
     wrappers:
-      - openstack:
-          single-use: True
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
@@ -107,6 +106,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -123,6 +123,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
+                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -149,6 +150,9 @@
       - string:
           name: DISTRO
           default: 'ubuntu1604'
+      - string:
+          name: CLEANUP
+          default: 'false'
 
     wrappers:
       - build-timeout: