summaryrefslogtreecommitdiffstats
path: root/jjb/kvmfornfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 13:13:35 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 16:28:01 +0000
commit3a2318e55dd35074c069b9ef9089fec7a138a88a (patch)
tree83505b368ed4378f9c79fb0e734373483c634c20 /jjb/kvmfornfv
parent75788714eef4a64f3119f855711c75165db5952a (diff)
Enable verify and merge jobs for stable/brahmaputra branch
Change-Id: I5f811a0db6c1725e02b3bfd51d8c7c21b12633a2 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/kvmfornfv')
-rw-r--r--jjb/kvmfornfv/kvmfornfv.yml29
1 files changed, 14 insertions, 15 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 562003350..368dab54e 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -1,16 +1,19 @@
- project:
name: kvmfornfv
+
+ project: '{name}'
+
jobs:
- 'kvmfornfv-verify-{stream}'
- 'kvmfornfv-merge-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
stream:
- master:
- branch: 'master'
-
- project: 'kvmfornfv'
+ branch: '{stream}'
+ gs-pathname: ''
+ - brahmaputra:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
- job-template:
name: 'kvmfornfv-verify-{stream}'
@@ -21,7 +24,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -47,10 +50,10 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'kvmfornfv'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
builders:
- shell:
@@ -59,17 +62,13 @@
- job-template:
name: 'kvmfornfv-merge-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
node: ericsson-build
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -89,10 +88,10 @@
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'kvmfornfv'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
builders:
- shell: