From 21028ecd8c90502d4aa03396965dabd30f96c6b9 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 24 Nov 2016 11:09:21 +0800 Subject: [PATCH] Adding GS_PROXY prefix to GS_URL in proxy scenario ${GS_PROXY} does not include branch name in the URL, when use it to download the latest.properties, it always downloads the master branch file, not the current release defined in ${gs-pathname}. In this patch, no longer directly use ${GS_BASE_PROXY}, but join them. JIRA: FUEL-225 Change-Id: I2566036c174b2f03997669d25a37f1de21ffeac6 Signed-off-by: Julien --- jjb/fuel/fuel-download-artifact.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 1f4aa8f85..2a0f09a3f 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -11,7 +11,7 @@ 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 +[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL if [[ "$JOB_NAME" =~ "merge" ]]; then echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties" -- 2.16.6