diff options
author | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-30 09:55:16 +0000 |
---|---|---|
committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-02-01 23:02:58 +0000 |
commit | d406fb03948296cdd02c7b93ffb9433ceb39d872 (patch) | |
tree | 3458df9618934e62fc92f5b9bcb2dec695923267 /jjb/fuel/fuel-download-artifact.sh | |
parent | 462fed8a52a50530ac843f7c4d2519b573749052 (diff) |
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 <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'jjb/fuel/fuel-download-artifact.sh')
-rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |