X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-engine-verify-deploy.yaml;h=0d023bc668168fe4ca145284893e1a63f20a129d;hb=71a220a8f4731783c2ce91bc1db78b8ed8269a5d;hp=1cff8df066434a0356d3fa74ebbe7a44d18a7e4e;hpb=5442f172dff09ee089e36f4f7682ffc50323c272;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index 1cff8df0..0d023bc6 100644
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -53,7 +53,7 @@
 
     distro:
       - ubuntu1804:
-          disabled: false
+          disabled: true
       - centos7:
           disabled: true
     cloud:
@@ -144,10 +144,6 @@
           name: DELETE_STACK
           default: 'yes'
           description: 'Delete the stack upon completion of the build'
-      - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
@@ -157,7 +153,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
@@ -234,7 +232,6 @@
                 KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -259,7 +256,6 @@
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -288,7 +284,7 @@
 - job-template:
     name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -317,7 +313,7 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/install-configure-heat/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/bootstrap-hwconfig/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Location of heat-environment file to use.'
       - string:
           name: STACK_NAME
@@ -343,9 +339,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - mask-passwords