cloud-infra: Set the right provisioner

The determine-scenario.sh script was not adapted to handle multiple
provisioners and it always set bifrost as the provisioner. This fixes
it.

Change-Id: I58d41bd12674829ea203c06f9c393644d8951e63

diff --git a/jjb/cloud-infra/determine-scenario.sh b/jjb/cloud-infra/determine-scenario.sh
index 10fea5706dc96e1aca070641bb6b2032c3ee96e2..14833b3e4c2d43e8145887d2b904fb78ae4b860c 100644 (file)
--- 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