summaryrefslogtreecommitdiffstats
path: root/jjb/multisite
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-01-30 09:55:16 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2017-02-01 23:02:58 +0000
commitd406fb03948296cdd02c7b93ffb9433ceb39d872 (patch)
tree3458df9618934e62fc92f5b9bcb2dec695923267 /jjb/multisite
parent462fed8a52a50530ac843f7c4d2519b573749052 (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/multisite')
-rw-r--r--jjb/multisite/multisite-daily-jobs.yml4
-rw-r--r--jjb/multisite/multisite-verify-jobs.yml1
2 files changed, 2 insertions, 3 deletions
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index fda2e682e..6b022fd75 100644
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -38,6 +38,7 @@
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- choice:
name: FRESH_INSTALL
choices:
@@ -161,11 +162,10 @@
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- string:
name: KINGBIRD_LOG_FILE
default: $WORKSPACE/kingbird.log
- - gerrit-parameter:
- branch: '{branch}'
- 'fuel-defaults'
- '{slave-label}-defaults'
- choice:
diff --git a/jjb/multisite/multisite-verify-jobs.yml b/jjb/multisite/multisite-verify-jobs.yml
index fdcc8d539..5ecfafb55 100644
--- a/jjb/multisite/multisite-verify-jobs.yml
+++ b/jjb/multisite/multisite-verify-jobs.yml
@@ -32,7 +32,6 @@
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'