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 c875323..89f6a39 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -33,6 +33,8 @@
 - job-template:
     name: 'pharos-daily-{stream}'
 
+    node: master
+
     # Job template for daily builders
     #
     # Required Variables:
@@ -70,17 +72,7 @@
 
     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
@@ -88,6 +80,8 @@
 - job-template:
     name: 'pharos-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -132,11 +126,13 @@
 
     builders:
         - shell:
-            !include-raw build-docu.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
@@ -180,15 +176,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