engine: Enable voting for offline jobs

Change-Id: If9d86bd326d5a815853b3f4662602f75ed534b66

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
index c83da3085304f5cf5a9b18aa1a0e0c855ba77003..eb7f1d4e20a003125132bf6e9b4bcda971d40683 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@ -38,10 +38,10 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          successful: true
-          failed: true
-          unstable: true
-          notbuilt: true
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
 
     distro:
       - ubuntu1804

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
index 8ed343ab75b98e4e9d16e4e47024b3c2bac5132b..2c020afc425bd43faf828331e646fd42e1452eba 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
@@ -77,11 +77,11 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: STACK_NAME
-          default: "nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "nordix-cicd-verify-engine-offline-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-offline-engine-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-offline-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
index 7f3b903140b5d6c3158f5d22e1637ee10acf7b9e..26bfe5d4f9e19efb8aeb440de25130cbca82f6f0 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
@@ -81,7 +81,7 @@
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-online-engine-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE

diff --git a/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh b/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
index f11c4d38be1d5ccdbd3a0de5e41b55f1c8085dbe..9b76d88284a2bd37f65b374015d31e49688207bf 100755 (executable)
--- a/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
+++ b/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
@@ -28,7 +28,7 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" && "$PROVISIONER_TYPE" == "heat"
 fi
 
 if [[ "$DELETE_STACK" != "true" || "$PROVISIONER_TYPE" != "heat" ]]; then
-  echo "Info  : Skipping stack delete"
+  echo "Info  : Skipping stack delete as it is either not a cloud deployment or slack deletion is disabled!"
   exit 0
 fi