summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjjb/armband/armband-download-artifact.sh5
-rwxr-xr-xjjb/armband/upload-artifacts.sh9
2 files changed, 12 insertions, 2 deletions
diff --git a/jjb/armband/armband-download-artifact.sh b/jjb/armband/armband-download-artifact.sh
index 18b55d7a7..7d01c09cf 100755
--- a/jjb/armband/armband-download-artifact.sh
+++ b/jjb/armband/armband-download-artifact.sh
@@ -10,6 +10,9 @@
set -o errexit
set -o pipefail
+# Configurable environment variables:
+# ISOSTORE (/iso_mount/opnfv_ci)
+
if [[ "$JOB_NAME" =~ "merge" ]]; then
echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
# get the properties file for the Armband Fuel ISO built for a merged change
@@ -33,7 +36,7 @@ ISO_FILE=${WORKSPACE}/opnfv.iso
# using ISOs for verify & merge jobs from local storage will be enabled later
if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
# check if we already have the ISO to avoid redownload
- ISOSTORE="/iso_mount/opnfv_ci/${GIT_BRANCH##*/}"
+ ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}
if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then
echo "ISO exists locally. Skipping the download and using the file from ISO store"
ln -s $ISOSTORE/$OPNFV_ARTIFACT ${ISO_FILE}
diff --git a/jjb/armband/upload-artifacts.sh b/jjb/armband/upload-artifacts.sh
index f4e84e9d2..7059ac344 100755
--- a/jjb/armband/upload-artifacts.sh
+++ b/jjb/armband/upload-artifacts.sh
@@ -9,6 +9,9 @@
##############################################################################
set -o pipefail
+# configurable environment variables:
+# ISOSTORE (/iso_mount/opnfv_ci)
+
# check if we built something
if [ -f $WORKSPACE/.noupload ]; then
echo "Nothing new to upload. Exiting."
@@ -19,11 +22,15 @@ fi
# source the opnfv.properties to get ARTIFACT_VERSION
source $WORKSPACE/opnfv.properties
+
# storing ISOs for verify & merge jobs will be done once we get the disk array
if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
# store ISO locally on NFS first
- ISOSTORE="/home/jenkins/opnfv/iso_store"
+ ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}
if [[ -d "$ISOSTORE" ]]; then
+ ISOSTORE=${ISOSTORE}/${GIT_BRANCH##*/}
+ mkdir -p $ISOSTORE
+
# remove all but most recent 3 ISOs first to keep iso_mount clean & tidy
cd $ISOSTORE
ls -tp | grep -v '/' | tail -n +4 | xargs -d '\n' /bin/rm -f --