Use GS_BASE_PROXY URL to download

[releng.git] / jjb / fuel / fuel-download-artifact.sh

diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
index a3769b1..5685444 100755 (executable)
--- a/jjb/fuel/fuel-download-artifact.sh
+++ b/jjb/fuel/fuel-download-artifact.sh
@@ -8,9 +8,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 set -o errexit
-set -o nounset
 set -o pipefail
 
+# use proxy url to replace the nomral URL, for googleusercontent.com will be blocked randomly
+[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=$GS_BASE_PROXY
+
 if [[ "$JOB_NAME" =~ "merge" ]]; then
     echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
     # get the properties file for the Fuel ISO built for a merged change
@@ -31,15 +33,24 @@ source latest.properties
 OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
 echo "Using $OPNFV_ARTIFACT for deployment"
 
-# check if we already have the ISO to avoid redownload
-# disabled for the timebeing - needs adjustments
-#ISO_STORE=$HOME/opnfv/iso_store/fuel
-#if [[ -f "$ISO_STORE/$OPNFV_ARTIFACT" ]]; then
-#    echo "ISO already exists. Skipping the download"
-#    ln -s $ISO_STORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
-#    ls -al $WORKSPACE/opnfv.iso
-#    exit 0
-#fi
+# 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##*/}"
+    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 $WORKSPACE/opnfv.iso
+        echo "--------------------------------------------------------"
+        echo
+        ls -al $WORKSPACE/opnfv.iso
+        echo
+        echo "--------------------------------------------------------"
+        echo "Done!"
+        exit 0
+    fi
+fi
+
+[[ "$NODE_NAME" =~ (zte) ]] && OPNFV_ARTIFACT_URL=${GS_BASE_PROXY%%/*}/$OPNFV_ARTIFACT_URL
 
 # log info to console
 echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL"