OPENDEV: Added openstack/barbican repository

[infra/cicd.git] / jjb / engine / scripts / deploy.sh

diff --git a/jjb/engine/scripts/deploy.sh b/jjb/engine/scripts/deploy.sh
index cfaa8c079917fdb6f632267595f1e1fe2dca458c..56010749b6965ea4df69c874185c592d72b4421a 100755 (executable)
--- a/jjb/engine/scripts/deploy.sh
+++ b/jjb/engine/scripts/deploy.sh
@@ -27,13 +27,24 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" && "$PROVISIONER_TYPE" == "heat"
   exit 0
 fi
 
+if [[ "$GERRIT_PROJECT" == "infra/installer/kolla" ]]; then
+  echo "Info  : Setting installer to kolla and scenario to os-nosdn-nofeature"
+  export INSTALLER_TYPE="kolla"
+  export DEPLOY_SCENARIO="os-nosdn-nofeature"
+fi
+
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   ENGINE_ROOT_DIR="/opt/engine/offline/git/engine"
 else
   ENGINE_ROOT_DIR="$WORKSPACE"
 fi
 
-/bin/cp -f $OPENRC_FILE /tmp/openrc
+# NOTE (fdegir): for bifrost based deployments, we don't need these files so we fake them
+OPENRC_FILE=${OPENRC_FILE:-/tmp/openrc}
+HEAT_ENVIRONMENT_FILENAME=${HEAT_ENVIRONMENT_FILENAME:-/tmp/heat}
+
+[[ ${PROVISIONER_TYPE} == "heat" ]] && /bin/cp -f $OPENRC_FILE /tmp/openrc
+
 cd "$ENGINE_ROOT_DIR/engine"
 ./deploy.sh -d "$INSTALLER_TYPE" -s "$DEPLOY_SCENARIO" -b "file://$ENGINE_ROOT_DIR/engine/inventory/group_vars/all/sdf.yaml" \
     -r "$PROVISIONER_TYPE" -p "$PDF" -i "$IDF" -u /tmp/openrc \