engine: Enable deployment for new engine verify jobs

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

diff --git a/jjb/engine/engine-verify-online-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
similarity index 86%
rename from jjb/engine/engine-verify-online-deploy-test.yaml
rename to jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
index e350840c5920b90cc8ebb5bbe8fbfa47ced31c24..61d9d18bf233f658adac52f251cbfc9cd0d2a3e1 100644 (file)
--- a/jjb/engine/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
@@ -102,13 +102,12 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-packaging-ubuntu1804.*'
-            - 'engine-verify-online-ubuntu1804.*'
-            - 'engine-verify-online-ubuntu1804.*'
-          block-level: 'NODE'
+#      - 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
@@ -139,11 +138,10 @@
           clean_before: false
 
     builders:
-      - shell: |
-          #!/bin/bash
-          cp $OPENRC_FILE /tmp/openrc
+      - 'engine-generate-ssh-keypair-macro'
+      - 'engine-download-artifact-macro'
       - multijob:
-          name: Offline Deployment on {type} instances
+          name: "Online Deployment on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -153,7 +151,7 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: Offline Testing on {type} instances
+          name: "Online Testing on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -162,6 +160,18 @@
               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'
 
 - job-template:
     name: 'engine-verify-online-{phase}-{distro}-{cloud}-{type}-{stream}'
@@ -172,13 +182,6 @@
 
     properties:
       - logrotate
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'engine-verify-packaging-ubuntu1804.*'
-            - 'engine-verify-online-ubuntu1804.*'
-            - 'engine-verify-offline-ubuntu1804.*'
-          block-level: 'NODE'
       - throttle:
           max-per-node: 1
           max-total: 3
@@ -197,8 +200,6 @@
               password: NORDIX_ARM_TOKEN
       - mask-passwords
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm-gerrit:
@@ -209,7 +210,4 @@
           clean_before: false
 
     builders:
-      - shell: |
-          #!/bin/bash
-          cp $OPENRC_FILE /tmp/openrc
-          env
+      - 'engine-{phase}-macro'