Switch to new location for heat environment files

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-engine-verify-deploy.yaml

diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index 33447806d972787c0136539dd262664475962e74..a0db3fd3f4bee24ceacb186ee1cc046a0587526d 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -54,16 +54,8 @@
     distro:
       - ubuntu1804:
           disabled: false
-          successful: false
-          failed: false
-          unstable: false
-          notbuilt: false
       - 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'
@@ -200,9 +204,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,6 +231,7 @@
                 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
@@ -248,6 +254,7 @@
                 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
@@ -310,7 +317,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