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/kvmfornfv/kvmfornfv.yml | |
| 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/kvmfornfv/kvmfornfv.yml')
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 2d1ab5779..157f2dcc4 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -57,7 +57,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - 'opnfv-build-ubuntu-defaults' @@ -91,7 +90,7 @@ - name: 'kvmfornfv-verify-build-{stream}' current-parameters: false predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH + BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER node-parameters: false @@ -104,7 +103,7 @@ - name: 'kvmfornfv-verify-test-{stream}' current-parameters: false predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH + BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER node-parameters: false @@ -128,7 +127,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - '{slave-label}-defaults' - 'kvmfornfv-defaults': @@ -147,7 +145,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - 'opnfv-build-ubuntu-defaults' - 'kvmfornfv-defaults': @@ -186,7 +183,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - 'opnfv-build-ubuntu-defaults' - 'kvmfornfv-defaults': @@ -260,7 +256,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - '{slave-label}-defaults' - 'kvmfornfv-defaults': |