Create jobs to handle and delete nolabs bookings

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

diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index 61e93f3961a033c7da99ee7138979cb30ac909a1..8887cf5c116eb2aa13204f3f8ae9e76a3d0de401 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -55,6 +55,7 @@
     distro:
       - ubuntu1804:
           disabled: 'false'
+          slave-label: vpod-test-ubuntu1804
 
     type:
       - virtual
@@ -83,7 +84,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-test-{distro}'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
       - string:
           name: DISTRO
@@ -116,6 +117,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'cloud-infra-verify-testfw-{distro}-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -132,17 +134,14 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
           project: 'infra\/test'
           branch: '{branch}'
           files: '**'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
 
     builders:
       - multijob:
@@ -243,6 +242,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-testfw-macro'