X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-deploy.sh;h=8bc5fa2683551922c0bdc85481772f6246e2aa7a;hb=989757d40d86b37953dd15995987965e793e6b44;hp=aa7b3bbb6b237af8d707cf1c9b3b8ae991f5878a;hpb=35f1e507f5276b63faed797f906da8c21dc4f8e4;p=releng.git

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index aa7b3bbb6..8bc5fa268 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -19,6 +19,9 @@ LAB_NAME=${NODE_NAME/-*}
 # shellcheck disable=SC2153
 POD_NAME=${NODE_NAME/*-}
 
+# 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!"
@@ -27,10 +30,6 @@ fi
 
 echo "Using configuration for ${LAB_NAME}"
 
-# Certain labs do not require the deploy script to be ran with sudo
-SUDO='sudo -E'
-[[ ! "${LAB_NAME}" =~ (arm|enea|unh) ]] || SUDO=
-
 # create TMPDIR if it doesn't exist, change permissions
 mkdir -p "${TMPDIR}"
 sudo chmod a+x "${HOME}" "${TMPDIR}"
@@ -43,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}"