From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 9 Jun 2015 02:15:06 +0000 (+0800)
Subject: create verify jobs for pharos for master and stable/arno
X-Git-Tag: arno.2015.2.0~208
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2fca11dac4a4d4e7f4ccd0069f1a526961d7a1ed;p=releng.git

create verify jobs for pharos for master and stable/arno

JIRA: OCTO-81

Change-Id: I14dd1415578f9dfa4dbfc1cf0174642e754d3438
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 89f6a392a..391180b9a 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -1,20 +1,27 @@
+#################################
+# job configuration for pharos
+#################################
 - project:
     name: pharos
     jobs:
         - 'pharos-test'
-        - 'pharos-daily-{stream}'
+        - 'pharos-daily-master'
         - 'pharos-merge'
-        - 'pharos-verify'
+        - 'pharos-verify-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    branch with - in place of / (eg. stable-arno)
+    # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+        - stable-arno:
+            branch: 'stable/arno'
 
     project: 'pharos'
     somevar: 'foo'
-
+##############################
+# job template
+##############################
 - job-template:
     name: pharos-test
 
@@ -31,7 +38,7 @@
             echo "Hello world from pharos"
 
 - job-template:
-    name: 'pharos-daily-{stream}'
+    name: 'pharos-daily-master'
 
     node: master
 
@@ -58,7 +65,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: '{branch}'
+            branch: master
 
     wrappers:
         - ssh-agent-credentials:
@@ -78,7 +85,7 @@
         - test-macro
 
 - job-template:
-    name: 'pharos-verify'
+    name: 'pharos-verify-{stream}'
 
     node: master
 
@@ -94,7 +101,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -122,7 +129,7 @@
                 project-pattern: 'pharos'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell: