From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 15 Jul 2015 08:36:36 +0000 (+0000)
Subject: Merge "create merge job for functest for master and stable/arno"
X-Git-Tag: arno.2015.2.0~160
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a5c8e537890a9177758b7756800406af9d606b42;hp=30152ddac9d2d625fd2f0382702aac3a7835ff7a;p=releng.git

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

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index da9f13cf4..2f927d5ce 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -3,7 +3,7 @@
     jobs:
         - 'opnfvdocs-daily-{stream}'
         - 'opnfvdocs-merge'
-        - 'opnfvdocs-verify'
+        - 'opnfvdocs-verify-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -60,7 +60,7 @@
             !include-raw docu-build.sh
 
 - job-template:
-    name: 'opnfvdocs-verify'
+    name: 'opnfvdocs-verify-{stream}'
 
     node: gce-opnfv-docker-1
 
@@ -76,7 +76,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -104,7 +104,7 @@
                 project-pattern: 'opnfvdocs'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell: