summaryrefslogtreecommitdiffstats
path: root/jjb/armband
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/armband')
-rwxr-xr-xjjb/armband/armband-deploy.sh15
-rw-r--r--jjb/armband/armband-verify-jobs.yml1
2 files changed, 15 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"
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 90fdd7eeb..f99ed572c 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -68,6 +68,7 @@
triggers:
- gerrit:
+ server-name: 'gerrit.opnfv.org'
trigger-on:
- patchset-created-event:
exclude-drafts: 'false'