X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-deploy.sh;h=8bc5fa2683551922c0bdc85481772f6246e2aa7a;hb=28f7d7c0ef101a6660b743620e0f2d5aa3e8993e;hp=1a5d6a44831c856bd8088cd6f098f51da84e2969;hpb=096247edf3195d4249787b01a73b8ad1ea4a200e;p=releng.git

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 1a5d6a448..8bc5fa268 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -19,21 +19,13 @@ LAB_NAME=${NODE_NAME/-*}
 # shellcheck disable=SC2153
 POD_NAME=${NODE_NAME/*-}
 
-# Fuel requires deploy script to be ran with sudo, Armband does not
-SUDO='sudo -E'
-if [ "${PROJECT}" = 'fuel' ]; then
-    # Fuel currently supports ericsson, intel, lf and zte labs
-    if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
-        echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
-        exit 1
-    fi
-else
-    SUDO=
-    # Armband currently supports arm, enea, unh labs
-    if [[ ! "${LAB_NAME}" =~ (arm|enea|unh) ]]; then
-        echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
-        exit 1
-    fi
+# define Docker tag for stable branches
+[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/}
+
+# Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs
+if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
+    echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
+    exit 1
 fi
 
 echo "Using configuration for ${LAB_NAME}"
@@ -50,8 +42,11 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 # Limited scope for vPOD verify jobs running on armband-virtual
 [[ ! "${JOB_NAME}" =~ verify-deploy-virtual-arm64 ]] || EXTRA_ARGS='-e'
 
+# turn on DEBUG mode
+[[ ${CI_DEBUG,,} == true ]] && EXTRA_ARGS="-D ${EXTRA_ARGS:-}"
+
 # construct the command
-DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh \
+DEPLOY_COMMAND="${WORKSPACE}/ci/deploy.sh \
     -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \
     -S ${TMPDIR} ${EXTRA_ARGS:-} \
     -L ${WORKSPACE}/${FUEL_LOG_FILENAME}"