summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-07-09 15:08:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-07-09 15:08:30 +0000
commit3c31d5f82fc07b7cfbc0681bced1fc619b6e29fa (patch)
tree71f4e0e20f3f3d6c8376b2ce50642d55ca37d71c
parentef1787f6d1801bdcc4d8a5df04c6779e9ab83bc0 (diff)
parent2702ab5de8a9f17e4093920d0dd6e847c28647bd (diff)
Merge "create merge jobs for octopus for master and stable arno"
-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: