X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-macros.yaml;h=100ca8fc3bb4feb56c7e6a3a6b2a30fc5df66f71;hb=5a14e5e16bd496387a4bd379ef008b8ad9205c83;hp=499c41aebec0a70680155dd7e7c6d977e7a6d172;hpb=d48647dcfa5724ec1ebdb4b883580e3f3ad48215;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index 499c41ae..100ca8fc 100644
--- a/jjb/cloud-infra/cloud-infra-macros.yaml
+++ b/jjb/cloud-infra/cloud-infra-macros.yaml
@@ -50,16 +50,61 @@
           !include-raw: ./cloud-infra-test.sh
 
 - builder:
-    name: 'cloud-infra-scenario-deploy-macro'
+    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: