Delete stack upon completion

[infra/cicd.git] / jjb / engine / engine-verify-jobs / engine-verify-deployment-parent-jobs.yaml

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 5376bb06fd453e14399b6c1069467f995e965142..c83da3085304f5cf5a9b18aa1a0e0c855ba77003 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
@@ -104,12 +104,6 @@
 
     properties:
       - logrotate
-#      - build-blocker:
-#          use-build-blocker: true
-#          blocking-jobs:
-#            - 'engine-verify-online-ubuntu1804.*'
-#            - 'engine-verify-offline-ubuntu1804.*'
-#          block-level: 'NODE'
       - throttle:
           max-per-node: 1
           max-total: 3
@@ -173,7 +167,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-#             enable-condition: "\"$EXECUTION_MODE\" == \"offline-deployment\""
       - multijob:
           name: "{environment-type} deployment and testing"
           condition: SUCCESSFUL
@@ -197,9 +190,8 @@
                 EXECUTION_MODE=$EXECUTION_MODE
                 VERBOSITY=$VERBOSITY
                 DISTRO=$DISTRO
-              property-file: "$WORKSPACE/change.properties"
               kill-phase-on: FAILURE
-              abort-all-job: true
+              abort-all-job: false
             - name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
               current-parameters: false
               node-parameters: false
@@ -219,7 +211,7 @@
                 VERBOSITY=$VERBOSITY
                 DISTRO=$DISTRO
               kill-phase-on: FAILURE
-              abort-all-job: true
+              abort-all-job: false
 
 - job-template:
     name: 'engine-verify-packaging-{distro}-{stream}'