diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-09-19 20:50:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-19 20:50:48 +0000 |
| commit | 7ca959d57760b61dca8fa862a5da90733affb264 (patch) | |
| tree | d89b1f5121bbf3d3d46cab7dfafedc5cccccc3b4 /jjb | |
| parent | bf5f6a35fbd81757c27421ca7d424ed238efde2d (diff) | |
| parent | f00bffcb799c6ad55f9d355e48d62e569d308bc4 (diff) | |
Merge "fuel-deploy.sh: mv lab-config repo to TMPDIR"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 6525c7ccb..d44c060ac 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -72,11 +72,13 @@ 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 + LOCAL_CFG="${TMPDIR}/securedlab" + rm -rf "${LOCAL_CFG}" + git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}" + LAB_CONFIG_URL="file://${LOCAL_CFG}" # Source local_env if present, which contains POD-specific config - local_env="${WORKSPACE}/lab-config/labs/${LAB_NAME}/${POD_NAME}/fuel/config/local_env" + local_env="${LOCAL_CFG}/labs/${LAB_NAME}/${POD_NAME}/fuel/config/local_env" if [ -e "${local_env}" ]; then echo "-- Sourcing local environment file" source "${local_env}" |