X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-deploy.sh;h=e818d90a387112ea5b550cac42d167f9f03be4bf;hb=86c54336f9de52fd82379f75b403de5cbcb35a38;hp=129f7532c56d254c51254f3efa7429bb9d0158b6;hpb=c897c28c442e9f32e760d6d575df109b448b2313;p=releng.git

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 129f7532c..e818d90a3 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -43,7 +43,7 @@ POD_NAME=${NODE_NAME/*-}
 LAB_CONFIG_URL=${LAB_CONFIG_URL:-'ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab'}
 
 # Fuel requires deploy script to be ran with sudo, Armband does not
-SUDO=sudo -E
+SUDO='sudo -E'
 if [ "${PROJECT}" = 'fuel' ]; then
     # Fuel does not use any POD-specific configuration for virtual deploys
     if [[ "${NODE_NAME}" =~ "virtual" ]]; then
@@ -72,15 +72,10 @@ chmod a+x "${HOME}" "${TMPDIR}"
 cd "${WORKSPACE}" || exit 1
 if [[ "${LAB_CONFIG_URL}" =~ ^(git|ssh):// ]]; then
     echo "Cloning securedlab repo ${BRANCH}"
-    git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" lab-config
-    LAB_CONFIG_URL=file://${WORKSPACE}/lab-config
-
-    # Source local_env if present, which contains POD-specific config
-    local_env="${WORKSPACE}/lab-config/labs/${LAB_NAME}/${POD_NAME}/fuel/config/local_env"
-    if [ -e "${local_env}" ]; then
-        echo "-- Sourcing local environment file"
-        source "${local_env}"
-    fi
+    LOCAL_CFG="${TMPDIR}/securedlab"
+    rm -rf "${LOCAL_CFG}"
+    git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
+    LAB_CONFIG_URL="file://${LOCAL_CFG}"
 fi
 
 # releng wants us to use nothing else but opnfv.iso for now. We comply.
@@ -101,7 +96,7 @@ echo "--------------------------------------------------------"
 echo "Scenario: ${DEPLOY_SCENARIO}"
 echo "Lab: ${LAB_NAME}"
 echo "POD: ${POD_NAME}"
-[[ "${BRANCH}" != 'master' ]] && echo "ISO: ${OPNFV_ARTIFACT_URL/*\/}"
+[[ "${BRANCH}" =~ 'danube' ]] && echo "ISO: ${OPNFV_ARTIFACT_URL/*\/}"
 echo
 echo "Starting the deployment using ${INSTALLER_TYPE}. This could take some time..."
 echo "--------------------------------------------------------"