summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2015-06-30 11:28:57 +0000
committerMatthewLi <matthew.lijun@huawei.com>2015-06-30 11:32:57 +0000
commit2702ab5de8a9f17e4093920d0dd6e847c28647bd (patch)
treedfce019f4e426a95cb58a47d72587e5029b0ee45 /jjb
parentc9d7b0e0a3fb35cd6b059e05979b79e2640db301 (diff)
create merge jobs for octopus for master and stable arno
JIRA: OCTO-85 Change-Id: I462cf572b0b2dd3a257d6dd3dff1cea44adf236e Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/octopus/octopus.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index e44e5ea93..e11ccc56c 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -6,7 +6,7 @@
jobs:
- 'octopus-test'
- 'octopus-daily-{stream}'
- - 'octopus-merge'
+ - 'octopus-merge-{stream}'
- 'octopus-verify-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
@@ -141,7 +141,7 @@
!include-raw ../opnfvdocs/docu-build.sh
- job-template:
- name: 'octopus-merge'
+ name: 'octopus-merge-{stream}'
node: master
@@ -161,7 +161,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
scm:
- gerrit-trigger-scm:
@@ -184,7 +184,7 @@
project-pattern: 'octopus'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
builders:
- shell: