X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpharos%2Fpharos.yml;h=6fcd11b9427187f005f40da28812901daae7a494;hb=5545d640db96d380e6d01f71a2dd16b7f1b057c3;hp=c875323425eebb73b31ba47ba14bfb21d6b146c6;hpb=adc6486b85b1b34251826da05704e029ed65da36;p=releng.git

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index c87532342..6fcd11b94 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,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,23 +79,15 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
-           /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/
-           /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-           /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
 
 - job-template:
-    name: 'pharos-verify'
+    name: 'pharos-verify-{stream}'
+
+    node: master
 
     project-type: freestyle
 
@@ -100,7 +101,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -128,15 +129,17 @@
                 project-pattern: 'pharos'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw docu-build.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
@@ -180,15 +183,5 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
-           /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/
-           /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-           /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-
+            !include-raw docu-build.sh