X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-macros.yaml;h=100ca8fc3bb4feb56c7e6a3a6b2a30fc5df66f71;hb=e504a2d79476433c3ebc3a84034f81fd56c6b291;hp=a7185aef80f694e2c5b6b2131d96fac8c3d16348;hpb=7a4397699aa2a1bc64e21b12a84c918ed30e8afe;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-macros.yaml b/jjb/cloud-infra/cloud-infra-macros.yaml
index a7185aef..100ca8fc 100644
--- a/jjb/cloud-infra/cloud-infra-macros.yaml
+++ b/jjb/cloud-infra/cloud-infra-macros.yaml
@@ -52,18 +52,18 @@
 - 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"
+          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
 
 - builder:
     name: 'cloud-infra-scenario-deploy-macro'
     builders:
-      - shell:
-          !include-raw: ./wait-for-pkg-manager.sh
       - shell:
           !include-raw: ./prepare-for-scenario-deploy.sh
       - shell:
@@ -77,4 +77,34 @@
       - 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: