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/global/releng-macros.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'jjb/global') diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 60fa22d63..e6440966a 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -26,14 +26,14 @@ name: GS_BASE_PROXY default: build.opnfv.org/artifacts.opnfv.org/$PROJECT description: "URL to Google Storage proxy" - -- parameter: - name: gerrit-parameter - parameters: + - string: + name: BRANCH + default: '{branch}' + description: "JJB configured BRANCH parameter (e.g. master, stable/danube)" - string: name: GERRIT_BRANCH default: '{branch}' - description: "JJB configured GERRIT_BRANCH parameter" + description: "JJB configured GERRIT_BRANCH parameter (deprecated)" - property: name: logrotate-default @@ -51,7 +51,7 @@ credentials-id: '$SSH_CREDENTIAL_ID' url: '$GIT_BASE' branches: - - 'origin/$GERRIT_BRANCH' + - 'origin/$BRANCH' timeout: 15 - scm: -- cgit 1.2.3-korg