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/doctor | |
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/doctor')
-rw-r--r-- | jjb/doctor/doctor.yml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 0d06fb7ef..11b4ffbc2 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -51,7 +51,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - 'opnfv-build-ubuntu-defaults' @@ -92,14 +91,8 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - string: - name: GIT_BRANCH - default: 'origin/{branch}' - description: "Override GIT_BRANCH parameter as we need stream name here" - #TODO(r-mibu): remove this work around by cleanup *_BRANCH params - - string: name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' |