X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-scenario.yaml;h=f05643fffbf618beddff753c07ddbd8adfffc2b3;hb=20aedd6675dd0a94a75d07eefaa99ef7f32ca389;hp=5b300a5034a96aebd42d9b680d9c415ce3267bf4;hpb=cde0f9dece6d879e7a4313bd902eec4aa14465e1;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index 5b300a50..f05643ff 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -47,25 +47,25 @@
     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:
@@ -121,11 +121,10 @@
       - 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-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -136,12 +135,16 @@
       - build-timeout:
           timeout: 90
       - 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 +256,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'