From d406fb03948296cdd02c7b93ffb9433ceb39d872 Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Mon, 30 Jan 2017 09:55:16 +0000 Subject: merge GIT_BRANCH and GERRIT_BRANCH into BRANCH GIT_BRANCH parameter is different; master or stable/danube in daily jobs, but 'refs/changes/57/27657/6' in verify jobs. This breaks some job builders triggered by the both types of jobs. We have GERRIT_BRANCH parameter for verify jobs to identify stream and expected branch into the patch will be merged after it got +2 and submitted. To avoid further confusion and to have common job builders for daily and verify jobs, this patch introduce BRANCH parameter. GERRIT_BRANCH is now deprecated. Change-Id: Ibcd42c1cd8a0be0f330878b21d3011f1ec97043b Signed-off-by: Ryota MIBU --- jjb/fuel/fuel-download-artifact.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jjb/fuel/fuel-download-artifact.sh') diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 2a0f09a3f..8cc552e8d 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -36,7 +36,7 @@ echo "Using $OPNFV_ARTIFACT for deployment" # 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="/iso_mount/opnfv_ci/${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 -- cgit 1.2.3-korg