X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-scenario.yaml;h=ab725eefd5d373021102ddb69c81f1c3caef64e0;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=37141c9cce92ed2a97bc0e3d20a7f5f29402f9a6;hpb=0592dda3310741a3ea414d6c59f7086c7fba7e29;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 37141c9c..ab725eef 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -47,31 +47,31 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
       - ubuntu1804:
-          disabled: false
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
+          slave-label: vpod-deploy-ubuntu1804
+          disabled: true
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
       - 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: 120
       - functest:
-          build-timeout: 30
+          build-timeout: 60
 
     jobs:
       - 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
@@ -111,10 +111,6 @@
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
-      - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
@@ -124,7 +120,10 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -133,14 +132,18 @@
 
     wrappers:
       - build-timeout:
-          timeout: 90
+          timeout: 180
       - 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:
@@ -166,7 +169,6 @@
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -186,7 +188,6 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 TEST_SUITE=$TEST_SUITE
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -199,7 +200,7 @@
 - job-template:
     name: 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -238,9 +239,6 @@
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - build-timeout:
@@ -252,6 +250,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'