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 daf266f..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,11 +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/
-
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -82,6 +80,8 @@
 - job-template:
     name: 'pharos-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -126,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
@@ -174,11 +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/
-
-
-
+            !include-raw docu-build.sh