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 9acf1e6..47563d6 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -2,7 +2,7 @@
     name: octopus
     jobs:
         - 'octopus-test'
-        - 'octopus-daily-master'
+        - 'octopus-daily-{stream}'
         - 'octopus-merge'
         - 'octopus-verify'
 
@@ -18,6 +18,8 @@
 - job-template:
     name: octopus-test
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -31,7 +33,9 @@
             echo "Hello world from octopus"
 
 - job-template:
-    name: 'octopus-daily-master'
+    name: 'octopus-daily-{stream}'
+
+    node: master
 
     # Job template for daily builders
     #
@@ -69,10 +73,8 @@
         - test-macro
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from octopus {somevar} daily"
+        - shell:
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -80,6 +82,8 @@
 - job-template:
     name: 'octopus-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -123,14 +127,14 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !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
@@ -173,13 +177,6 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-
-
-
-
+        - shell:
+            !include-raw docu-build.sh