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=33447806d972787c0136539dd262664475962e74;hpb=2dacaf5d621dfa8dcb78cddd7013dae047a12bde;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 33447806..0d023bc6 100644
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -53,17 +53,9 @@
 
     distro:
       - ubuntu1804:
-          disabled: false
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
+          disabled: true
       - centos7:
           disabled: true
-          successful: true
-          failed: true
-          unstable: true
-          notbuilt: true
     cloud:
       - city:
           openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
@@ -72,9 +64,17 @@
       - virtual:
           provisioner-type: 'bifrost'
           slave-type: 'vpod'
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
       - cloud:
           provisioner-type: 'heat'
           slave-type: 'jumphost'
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
 
     phase:
       - deploy:
@@ -124,6 +124,10 @@
           name: STACK_NAME
           default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
           description: 'Name of the created stack'
+      - string:
+          name: KEYPAIR_NAME
+          default: "keypair-nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
@@ -140,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
@@ -153,7 +153,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
@@ -200,9 +202,10 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: 'ANT'
-                  pattern: '**'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
@@ -226,9 +229,9 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 STACK_NAME=$STACK_NAME
+                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
@@ -248,11 +251,11 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 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
@@ -281,7 +284,7 @@
 - job-template:
     name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -310,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
@@ -336,9 +339,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - mask-passwords