Merge changes from topic 'cloud-infra-jjb'

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-scenario.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index fcd12c209909c322b765e0d55e96bd0f693540be..0e8d3f034bb8d552a0e21ab5b386965c3a1540ab 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -74,6 +74,7 @@
       - baremetal:
           slave-label: 'baremetal-deploy'
           yardstick-dispatcher: 'influxdb'
+          provisioner-type: 'bifrost'
 
     phase:
       - deploy:
@@ -119,6 +120,10 @@
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
+      - string:
+          name: PROVISIONER_TYPE
+          default: '{provisioner-type}'
+          description: 'Provisioner to use for provisioning nodes'
       - string:
           name: INSTALLER_TYPE
           default: '{installer-type}'
@@ -172,7 +177,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE
+          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
       - multijob:
           name: deploy
           condition: SUCCESSFUL
@@ -183,6 +188,7 @@
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
@@ -199,6 +205,7 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -216,6 +223,7 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -233,6 +241,7 @@
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -276,6 +285,10 @@
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
           description: 'Scenario to deploy and test'
+      - string:
+          name: PROVISIONER_TYPE
+          default: 'bifrost'
+          description: 'Provisioner to use for provisioning nodes'
       - string:
           name: INSTALLER_TYPE
           default: 'kubespray'
@@ -315,7 +328,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
+          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
       - 'scenario-{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: