Create jobs to handle and delete nolabs bookings

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

diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index 5b300a5034a96aebd42d9b680d9c415ce3267bf4..345c87bd48ac1fe1c84df105f732b40fa71173cb 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -47,29 +47,29 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
       - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
-          disabled: false
+          slave-label: vpod-deploy-centos7
+          disabled: true
           successful: true
           failed: true
           unstable: true
           notbuilt: true
 
     type:
-      - virtual:
-          slave-label: 'vpod-deploy-city'
+      - virtual
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
           build-timeout: 30
 
@@ -121,11 +121,11 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{distro}-.*'
-            - 'cloud-infra-verify-scenario-{distro}-.*'
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -134,14 +134,18 @@
 
     wrappers:
       - build-timeout:
-          timeout: 90
+          timeout: 120
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - nordix-gerrit-trigger-patchset-created:
@@ -253,6 +257,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-determine-scenario-macro'