Update docs to test script

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

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index cee73a4..c763899 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -1,20 +1,29 @@
+#################################
+# job configuration for pharos
+#################################
 - project:
     name: pharos
     jobs:
         - 'pharos-test'
         - 'pharos-daily-{stream}'
-        - 'pharos-merge'
-        - 'pharos-verify'
+        - 'pharos-merge-{stream}'
+        - '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'
+            gs-pathname: ''
+        - stable-arno:
+            branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'pharos'
     somevar: 'foo'
-
+##############################
+# job template
+##############################
 - job-template:
     name: pharos-test
 
@@ -33,6 +42,8 @@
 - job-template:
     name: 'pharos-daily-{stream}'
 
+    node: master
+
     # Job template for daily builders
     #
     # Required Variables:
@@ -51,6 +62,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - pharos-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -63,24 +76,22 @@
             user: '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - 'pharos-{stream}'
 
     prebuilders:
         - test-macro
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
-           gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/
-
+            !include-raw ../opnfvdocs/docu-build.sh
 
     postbuilders:
         - test-macro
 
 - job-template:
-    name: 'pharos-verify'
+    name: 'pharos-verify-{stream}'
+
+    node: master
 
     project-type: freestyle
 
@@ -94,7 +105,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -122,14 +133,16 @@
                 project-pattern: 'pharos'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
-    name: 'pharos-merge'
+    name: 'pharos-merge-{stream}'
+
+    node: master
 
     # builder-merge job to run JJB update
     #
@@ -147,7 +160,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -170,15 +183,32 @@
                 project-pattern: 'pharos'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/pharos/docs/
-           gsutil cp docs/*.html gs://artifacts.opnfv.org/pharos/docs/
-
-
+            !include-raw ../opnfvdocs/docu-build.sh
 
+########################
+# parameter macros
+########################
+- parameter:
+    name: pharos-parameter
+    parameters:
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where the pharos documents will be stored in gs repository"
+
+########################
+## trigger macros
+#########################
+- trigger:
+    name: 'pharos-master'
+    triggers:
+       - pollscm: "H 6 * * *"
 
+- trigger:
+    name: 'pharos-stable-arno'
+    triggers:
+       - pollscm: "H 18 * * *"