Delete stack upon completion

[infra/cicd.git] / jjb / engine / engine-verify-jobs / engine-verify-online-deploy-test.yaml

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 61d9d18bf233f658adac52f251cbfc9cd0d2a3e1..7f3b903140b5d6c3158f5d22e1637ee10acf7b9e 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
@@ -77,37 +77,35 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: STACK_NAME
-          default: "nordix-cicd-verify-engine-{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-engine-{distro}-$BUILD_NUMBER"
+          default: "keypair-nordix-cicd-verify-online-engine-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
+      - string:
+          name: TEST_REPO_URL
+          default: 'https://gerrit.nordix.org/infra/test.git'
+          description: 'URL to clone the test repo from'
+      - string:
+          name: TEST_FW
+          default: 'functest'
+          description: 'Test framework to use'
       - string:
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
-      - string:
-          name: YARDSTICK_DISPATCHER
-          default: 'file'
-          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: DELETE_STACK
-          default: 'yes'
+          default: 'true'
           description: 'Delete the stack upon completion of the build'
 
     properties:
       - logrotate
-#      - build-blocker:
-#          use-build-blocker: true
-#          blocking-jobs:
-#            - 'engine-verify-online-deploy-test-.*'
-#            - 'engine-verify-offline-deploy-test-.*'
-#          block-level: 'NODE'
       - throttle:
           max-per-node: 1
           max-total: 3
@@ -138,6 +136,7 @@
           clean_before: false
 
     builders:
+      - 'engine-wait-pkg-mgr-macro'
       - 'engine-generate-ssh-keypair-macro'
       - 'engine-download-artifact-macro'
       - multijob:
@@ -149,7 +148,7 @@
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE
-              abort-all-job: true
+              abort-all-job: false
       - multijob:
           name: "Online Testing on {type} instances"
           condition: SUCCESSFUL
@@ -159,19 +158,21 @@
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE
-              abort-all-job: true
-      - 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'
+              abort-all-job: false
+
+    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}'