summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2016-08-11 23:57:40 +0800
committerJulien <zhang.jun3g@zte.com.cn>2016-08-11 23:57:40 +0800
commit5b0f175baa6e2c5b83d5e918588e35b36933a25b (patch)
tree00e9e07ecf1a6563a7ec7193540facaef1120bb0
parent6d98467d60f1215290f52c6093e18e27805bf52d (diff)
Use GS_BASE_PROXY URL to download
For artifcats.opnfv.org is actually domain googleusercontent.com, and the website is blocked randomly. For labs in area where google.com/googleuserconent.com can not be accessed, use the proxy website. Update proxy wrong URL from build.opnfv.org/artifacts/$PROJECT to build.opnfv.org/artifacts.opnfv.org/$PROJECT Change-Id: Iabdbe18937197c79a7d0e31cb0f31f2805a3f35b Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-rwxr-xr-xjjb/fuel/fuel-download-artifact.sh5
-rw-r--r--jjb/releng-macros.yaml2
2 files changed, 6 insertions, 1 deletions
diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
index d78ddc5ba..5685444f8 100755
--- a/jjb/fuel/fuel-download-artifact.sh
+++ b/jjb/fuel/fuel-download-artifact.sh
@@ -10,6 +10,9 @@
set -o errexit
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
@@ -47,6 +50,8 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
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"
echo "This could take some time..."
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c14ea6c47..8328aec03 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -13,7 +13,7 @@
description: "URL to Google Storage."
- string:
name: GS_BASE_PROXY
- default: build.opnfv.org/artifacts/$PROJECT
+ default: build.opnfv.org/artifacts.opnfv.org/$PROJECT
description: "URL to Google Storage proxy"
- parameter: