X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blobdiff_plain;f=jjb%2Fapex%2Fapex-deploy.sh;h=123db3e85405ce86810ea63ee4b6ecf99c1f3fcc;hp=b8ae75a1f411d46ea2a684949e2dc354713d2b3c;hb=013ab627c0b7f43dda7bc6e8f654b50e8e9a64a3;hpb=b87f1d4130984073ed11989f06c7ccf6a28985d5

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index b8ae75a1f..123db3e85 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -31,7 +31,9 @@ elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
 fi
 
 # Dev or RPM/ISO build
-if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
+# For upstream deployments we currently only use git repo and not RPM
+# Need to decide after Fraser if we want to use RPM or not for upstream
+if [[ "$ARTIFACT_VERSION" =~ dev || "$DEPLOY_SCENARIO" =~ "upstream" ]]; then
   # Settings for deploying from git workspace
   DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
   NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
@@ -134,6 +136,11 @@ else
   DEPLOY_CMD="${DEPLOY_CMD} -i ${INVENTORY_FILE}"
 fi
 
+if [[ "$DEPLOY_SCENARIO" =~ "upstream" ]]; then
+  echo "Upstream deployment detected"
+  DEPLOY_CMD="${DEPLOY_CMD} --upstream"
+fi
+
 if [ "$IPV6_FLAG" == "True" ]; then
   NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
 elif echo ${DEPLOY_SCENARIO} | grep fdio; then