X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fengine-verify-jobs%2Fengine-verify-online-deploy-test.yaml;h=26bfe5d4f9e19efb8aeb440de25130cbca82f6f0;hb=refs%2Fchanges%2F82%2F4082%2F2;hp=c295c788cf5dd7c6e9d33ec5cdbb44ca5cb9b77a;hpb=182857684a71841aac11050ccd8538780c65c499;p=infra%2Fcicd.git

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 c295c788..26bfe5d4 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-online-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}-$BUILD_NUMBER"
+          default: "nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-online-engine-{distro}-$BUILD_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
@@ -159,18 +159,20 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: strings-match
-              condition-string1: $DELETE_STACK
-              condition-string2: true
-            - condition-kind: strings-match
-              condition-string1: $PROVISIONER_TYPE
-              condition-string2: heat
-          on-evaluation-failure: dont-run
-          steps:
-            - 'engine-delete-stack-macro'
+
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - 'engine-wait-pkg-mgr-macro'
+                - 'engine-delete-stack-macro'
 
 - job-template:
     name: 'engine-verify-online-{phase}-{distro}-{cloud}-{type}-{stream}'