diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-24 17:53:21 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-24 18:00:43 +0100 |
| commit | c5058eac06a279f1f61c70e583de667d994a21c8 (patch) | |
| tree | 3d2790cffc71e1118a15eff18f9408f901c6497b /jjb | |
| parent | 4b1560c6499e53efb3b2ca83294265052396b2d5 (diff) | |
[fuel] deploy: Stop using securedlab for master
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>
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}" |