Merge "create verify jobs for functest for master and stable/arno"

[releng.git] / jjb / pharos / pharos.yml

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 85f03b7..391180b 100644 (file)
--- 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,9 @@
             echo "Hello world from pharos"
 
 - job-template:
-    name: 'pharos-daily-{stream}'
+    name: 'pharos-daily-master'
+
+    node: master
 
     # Job template for daily builders
     #
@@ -56,7 +65,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: '{branch}'
+            branch: master
 
     wrappers:
         - ssh-agent-credentials:
@@ -70,13 +79,15 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
 
 - job-template:
-    name: 'pharos-verify'
+    name: 'pharos-verify-{stream}'
+
+    node: master
 
     project-type: freestyle
 
@@ -90,7 +101,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -118,15 +129,17 @@
                 project-pattern: 'pharos'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw build-docu-verify.sh
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'pharos-merge'
 
+    node: master
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -170,5 +183,5 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh