X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-macros.yaml;h=268c9877a0acdc6234b27e7329936288a6bdba89;hb=fcf1625b33c598f764eac0bcd21d98568683abab;hp=d5df7fc3b3c763478d2a35c25e1520b854c43bfc;hpb=0c0e67aaf375e2e26e3cfa97037d628e4a96c122;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index d5df7fc3..268c9877 100644
--- 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,32 @@
       - 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: $INSTALLER_TYPE - Scenario: $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
+
 # vim: set ts=2 sw=2 expandtab: