diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-01-25 19:09:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-25 19:09:09 +0000 |
| commit | 28f546569dbad964b6b1525821b65e22db1b0e3d (patch) | |
| tree | b77ecd3cd4019b08a1c4123ca596fa4a1abcd5c4 /jjb | |
| parent | c99860d6531ff48dee5f6f3d848314229bca6d77 (diff) | |
| parent | c5058eac06a279f1f61c70e583de667d994a21c8 (diff) | |
Merge "[fuel] deploy: Stop using securedlab for master"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 3a52d1d50..cb9febe2a 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -74,19 +74,23 @@ mkdir -p "${TMPDIR}" 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 -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}" |