Merge "create merge job for functest for master and stable/arno"

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 0d77606..f0193e1 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -26,7 +26,7 @@
         - 'functest-vims-test-{pod}'
         - 'functest-vping-test-{pod}'
         - 'functest-daily-{stream}'
-        - 'functest-merge'
+        - 'functest-merge-{stream}'
         - 'functest-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -354,7 +354,7 @@
             !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
-    name: 'functest-merge'
+    name: 'functest-merge-{stream}'
 
     node: master
 
@@ -374,7 +374,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -397,7 +397,7 @@
                 project-pattern: 'functest'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell: