Add job to cleanup cicd stacks and keypairs

[infra/cicd.git] / jjb / cloud-infra / engine-macros.yaml

diff --git a/jjb/cloud-infra/engine-macros.yaml b/jjb/cloud-infra/engine-macros.yaml
index 32d44e033d0b7ddb00c195d2329e5359d2d9e354..4218645e9fa730fb72d1874f1c3087c1a5ba39bf 100644 (file)
--- a/jjb/cloud-infra/engine-macros.yaml
+++ b/jjb/cloud-infra/engine-macros.yaml
@@ -52,10 +52,22 @@
           !include-raw: ./scripts/upload-artifact.sh
 
 - builder:
-    name: 'download-artifact-macro'
+    name: 'download-deploy-artifact-macro'
     builders:
       - shell:
-          !include-raw: ./scripts/download-artifact.sh
+          !include-raw: ./scripts/download-deploy-artifact.sh
+
+- builder:
+    name: 'download-functest-artifact-macro'
+    builders:
+      - shell:
+          !include-raw: ./scripts/download-functest-artifact.sh
+
+- builder:
+    name: 'download-yardstick-artifact-macro'
+    builders:
+      - shell:
+          !include-raw: ./scripts/download-yardstick-artifact.sh
 
 - builder:
     name: 'deploy-macro'
@@ -81,6 +93,12 @@
       - shell:
           !include-raw: ./scripts/delete-heat-stack.sh
 
+- builder:
+    name: 'cloud-infra-cleanup-stack-macro'
+    builders:
+      - shell:
+          !include-raw: ./scripts/cleanup-heat-stacks.sh
+
 - builder:
     name: 'wait-pkg-mgr-macro'
     builders:
@@ -104,10 +122,14 @@
     builders:
       - shell:
           !include-raw: ./scripts/generate-release-metadata.sh
+- builder:
+    name: 'generate-k8sdeployment-environment-macro'
+    builders:
+      - shell:
+          !include-raw: ./scripts/generate-k8sdeployment-environment.sh
 
 - builder:
     name: 'promote-macro'
     builders:
       - shell:
           !include-raw: ./scripts/promote.sh
-