Fixed missing "node: master" in octopus merge job

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

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index efd9a22..47563d6 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -74,11 +74,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
-           /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
-
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -132,11 +128,13 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'octopus-merge'
 
+    node: master
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -180,10 +178,5 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
-           /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
-
-
+            !include-raw docu-build.sh