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/joid/joid-daily-jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jjb/joid/joid-daily-jobs.yml') diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index ad1a76f0a..b28dd6025 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -114,6 +114,7 @@ parameters: - project-parameter: project: '{project}' + branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults': installer: '{installer}' @@ -184,7 +185,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults': -- cgit 1.2.3-korg