summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4b1560c)
Instead of cloning securedlab locally and passing it to Fuel deploy
script, rely on Pharos git repo, embedded as a git submodule in Fuel.
Keep old behavior (using securedlab) for stable/{danube,euphrates}.
Depends-on: Ib04e4fb384568a6efd9e78a080857b663521ae88
Change-Id: Ie30879292ae04b641257760de69c900a9eb4ef84
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
chmod a+x "${HOME}" "${TMPDIR}"
cd "${WORKSPACE}" || exit 1
chmod a+x "${HOME}" "${TMPDIR}"
cd "${WORKSPACE}" || exit 1
-if [[ "${LAB_CONFIG_URL}" =~ ^(git|ssh):// ]]; then
- echo "Cloning securedlab repo ${BRANCH}"
- LOCAL_CFG="${TMPDIR}/securedlab"
- rm -rf "${LOCAL_CFG}"
- git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
- LAB_CONFIG_URL="file://${LOCAL_CFG}"
+if [[ "$BRANCH" =~ (danube|euphrates) ]]; then
+ if [[ "${LAB_CONFIG_URL}" =~ ^(git|ssh):// ]]; then
+ echo "Cloning securedlab repo ${BRANCH}"
+ LOCAL_CFG="${TMPDIR}/securedlab"
+ rm -rf "${LOCAL_CFG}"
+ git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
+ LAB_CONFIG_ARG="-b file://${LOCAL_CFG}"
+ else
+ LAB_CONFIG_ARG="-b ${LAB_CONFIG_URL}"
+ fi
fi
# log file name
FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
# construct the command
fi
# log file name
FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
# construct the command
-DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh -b ${LAB_CONFIG_URL} \
+DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh ${LAB_CONFIG_ARG:-} \
-l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} ${ISO_FILE_ARG:-} \
-B ${DEFAULT_BRIDGE:-${BRIDGE}} -S ${TMPDIR} \
-L ${WORKSPACE}/${FUEL_LOG_FILENAME}"
-l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} ${ISO_FILE_ARG:-} \
-B ${DEFAULT_BRIDGE:-${BRIDGE}} -S ${TMPDIR} \
-L ${WORKSPACE}/${FUEL_LOG_FILENAME}"