diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-08-11 21:45:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-11 21:45:52 +0000 |
| commit | 41c309ff3d87b4916b6b9f2328309630780a6452 (patch) | |
| tree | 66cff80bef12af6182e4422ebaf9aeec5072c072 | |
| parent | b2858da446152245442a7fd30d363668f8baba1b (diff) | |
| parent | 5b0f175baa6e2c5b83d5e918588e35b36933a25b (diff) | |
Merge "Use GS_BASE_PROXY URL to download"
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 5 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 2 |
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: |