summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2016-11-30 20:15:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-30 20:15:46 +0000
commit9e316dc0bf824aa14a96b87c5e9aab6f2af41f35 (patch)
tree0f9b5985e08060016db282140cc51222f18a0819
parent8234e8264f51c03e58085e2c3765011802767ab8 (diff)
parent0e42984c970f100775c66776c32d654b84603efb (diff)
Merge "armband: Enable deploy-cache"
-rwxr-xr-xjjb/armband/armband-deploy.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index e0631c424..4df9acfd8 100755
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -71,10 +71,23 @@ ISO_FILE=$WORKSPACE/opnfv.iso
# log file name
FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
+# Deploy Cache (to enable just create the deploy-cache subdir)
+# NOTE: Only available when ISO files are cached using ISOSTORE mechanism
+DEPLOY_CACHE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}/deploy-cache
+if [[ -d "${DEPLOY_CACHE}" ]]; then
+ echo "Deploy cache dir present."
+ echo "--------------------------------------------------------"
+ echo "Fuel@OPNFV deploy cache: ${DEPLOY_CACHE}"
+ DEPLOY_CACHE="-C ${DEPLOY_CACHE}"
+else
+ DEPLOY_CACHE=""
+fi
+
# construct the command
DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
-l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
- -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+ -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+ ${DEPLOY_CACHE}"
# log info to console
echo "Deployment parameters"