X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fdetermine-scenario.sh;h=14833b3e4c2d43e8145887d2b904fb78ae4b860c;hb=b2205c4e7fafbadc724db1da0c2c7c1e58370e9c;hp=14950f4f188cc9d94f0f39d3b3756da497fe7394;hpb=cfcf7786ed2d08a07dcdacc8aaabfb4f7e2a46ab;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/determine-scenario.sh b/jjb/cloud-infra/determine-scenario.sh
index 14950f4f..14833b3e 100644
--- a/jjb/cloud-infra/determine-scenario.sh
+++ b/jjb/cloud-infra/determine-scenario.sh
@@ -47,7 +47,9 @@ function override_installer_scenario() {
     export PROVISIONER_TYPE=$(echo "$COMMIT_MESSAGE" | grep '^provisioner-type:' | cut -d":" -f2 | sed 's/\s*//g')
   else
     # default is almost always bifrost
-    export PROVISIONER_TYPE=bifrost
+    if [[ "$PROVISIONER_TYPE" == "" ]]; then
+      export PROVISIONER_TYPE=bifrost
+    fi
   fi
 
   if [[ "$COMMIT_MESSAGE" =~ "deploy-scenario:" && "$COMMIT_MESSAGE" =~ "installer-type:" ]]; then
@@ -69,7 +71,7 @@ function determine_scenario() {
   echo "Info: Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC"
   if [[ "$GERRIT_PROJECT" == "infra/engine" ]]; then
     echo "Info: Setting INSTALLER_TYPE and DEPLOY_SCENARIO to defaults for project $GERRIT_PROJECT patchset $GERRIT_REFSPEC"
-    export PROVISIONER_TYPE=bifrost
+    export PROVISIONER_TYPE=$PROVISIONER_TYPE
     export INSTALLER_TYPE=kubespray
     export DEPLOY_SCENARIO=k8-calico-nofeature
     write_change_metadata