OPENDEV: Add patchset-created trigger for push upstream jenkins job.

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

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index d5df7fc3b3c763478d2a35c25e1520b854c43bfc..100ca8fc3bb4feb56c7e6a3a6b2a30fc5df66f71 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-macros.yaml
+++ b/jjb/cloud-infra/cloud-infra-macros.yaml
@@ -31,7 +31,7 @@
     name: 'cloud-infra-functest-macro'
     builders:
       - shell:
-          !include-raw: ./prepare-for-test.sh
+          !include-raw: ./prepare-for-testfw-verify.sh
       - shell:
           !include-raw: ./cloud-infra-test.sh
 
@@ -39,7 +39,7 @@
     name: 'cloud-infra-yardstick-macro'
     builders:
       - shell:
-          !include-raw: ./prepare-for-test.sh
+          !include-raw: ./prepare-for-testfw-verify.sh
       - shell:
           !include-raw: ./cloud-infra-test.sh
 
@@ -49,4 +49,62 @@
       - shell:
           !include-raw: ./cloud-infra-test.sh
 
+- builder:
+    name: 'cloud-infra-determine-scenario-macro'
+    builders:
+      - shell:
+          !include-raw: ./wait-for-pkg-manager.sh
+      - shell:
+          !include-raw: ./determine-scenario.sh
+      - inject:
+          properties-file: "$WORKSPACE/change.properties"
+      - description-setter:
+          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
+
+- builder:
+    name: 'cloud-infra-scenario-deploy-macro'
+    builders:
+      - shell:
+          !include-raw: ./prepare-for-scenario-deploy.sh
+      - shell:
+          !include-raw: ./cloud-infra-scenario-deploy.sh
+
+- builder:
+    name: 'cloud-infra-scenario-functest-macro'
+    builders:
+      - shell:
+          !include-raw: ./prepare-for-scenario-test.sh
+      - shell:
+          !include-raw: ./cloud-infra-scenario-test.sh
+
+- builder:
+    name: 'scenario-deploy-macro'
+    builders:
+      - shell:
+          !include-raw: ./wait-for-pkg-manager.sh
+      - shell:
+          !include-raw: ./scenario-deploy.sh
+
+- builder:
+    name: 'scenario-functest-macro'
+    builders:
+      - shell:
+          !include-raw: ./prepare-for-testfw-verify.sh
+      - shell:
+          !include-raw: ./scenario-functest.sh
+
+- builder:
+    name: 'scenario-yardstick-macro'
+    builders:
+      - shell:
+          !include-raw: ./prepare-for-testfw-verify.sh
+      - shell:
+          !include-raw: ./scenario-yardstick.sh
+
+- builder:
+    name: 'scenario-promote-macro'
+    builders:
+      - shell:
+          !include-raw: ./scenario-promote.sh
+
 # vim: set ts=2 sw=2 expandtab: