X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-scenario.yaml;h=9a24c3be52907ff025a9c90b2c7a5f0bb196f5e7;hb=0a2e213dc932ba328e4b9ce8c40a8cef93f91e5f;hp=326a44689ae504cbd1699ac791841d7c93637565;hpb=e28fcbfae845e567182f9841965b9a9a3ea135bb;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 326a4468..9a24c3be 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -69,9 +69,9 @@
 
     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,8 +132,10 @@
 
     wrappers:
       - build-timeout:
-          timeout: 90
+          timeout: 180
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -168,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
@@ -188,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
@@ -240,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: