Extend dynamic project variable in docu-build scripts

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

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 690b7f3..89f6a39 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -2,10 +2,9 @@
     name: pharos
     jobs:
         - 'pharos-test'
-        - 'pharos-daily-master'
+        - 'pharos-daily-{stream}'
         - 'pharos-merge'
         - 'pharos-verify'
-        - 'pharos-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -32,7 +31,9 @@
             echo "Hello world from pharos"
 
 - job-template:
-    name: 'pharos-daily-master'
+    name: 'pharos-daily-{stream}'
+
+    node: master
 
     # Job template for daily builders
     #
@@ -70,10 +71,8 @@
         - test-macro
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from pharos {somevar} daily"
+        - shell:
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -81,6 +80,8 @@
 - job-template:
     name: 'pharos-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -124,14 +125,14 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !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
@@ -174,55 +175,6 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'pharos-build-docs'
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'pharos'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            !include-raw build-docu.sh
-
-
-
+        - shell:
+            !include-raw docu-build.sh