Merge "create merge jobs for octopus for master and stable arno"

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index e44e5ea..e11ccc5 100644 (file)
--- 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: