Fix scenario verification jobs

[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 499c41aebec0a70680155dd7e7c6d977e7a6d172..a7185aef80f694e2c5b6b2131d96fac8c3d16348 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-macros.yaml
+++ b/jjb/cloud-infra/cloud-infra-macros.yaml
@@ -49,17 +49,32 @@
       - shell:
           !include-raw: ./cloud-infra-test.sh
 
+- builder:
+    name: 'cloud-infra-determine-scenario-macro'
+    builders:
+      - 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: ./wait-for-pkg-manager.sh
+      - 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: