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-deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jjb/fuel/fuel-deploy.sh') diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 48b1dac2f..4efccd611 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -57,9 +57,9 @@ chmod a+x $TMPDIR # clone the securedlab repo cd $WORKSPACE -echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" +echo "Cloning securedlab repo $BRANCH" git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \ - --branch ${GIT_BRANCH##origin/} + --branch $BRANCH # log file name FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" -- cgit 1.2.3-korg