X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Foctopus%2Foctopus.yml;h=b89912c65965827a51bd9e7218f23158af5274e3;hb=14c253c2edb4d7bda9852c2006a334445950cc47;hp=c72292c8fd09a5c9d60aae4ced700d3356d803a0;hpb=2d5841eb74688afbec3ef571199bf2a8d4c09276;p=releng.git

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index c72292c8f..b89912c65 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -1,25 +1,31 @@
+################################
+# job configuration for Octopus
+################################
 - project:
     name: octopus
     jobs:
         - 'octopus-test'
-        - 'octopus-daily-{stream}'
+        - 'octopus-daily-master'
         - 'octopus-merge'
-        - 'octopus-verify'
+        - 'octopus-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'
+        - stable-arno:
+            branch: 'stable/arno'
 
     project: 'octopus'
     somevar: 'foo'
+###############################
+# job templates
+###############################
 
 - job-template:
     name: octopus-test
 
-    node: master
-
     project-type: freestyle
 
     logrotate:
@@ -33,7 +39,7 @@
             echo "Hello world from octopus"
 
 - job-template:
-    name: 'octopus-daily-{stream}'
+    name: 'octopus-daily-master'
 
     node: master
 
@@ -60,7 +66,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: '{branch}'
+            branch: master
 
     wrappers:
         - ssh-agent-credentials:
@@ -74,13 +80,13 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
 
 - job-template:
-    name: 'octopus-verify'
+    name: 'octopus-verify-{stream}'
 
     node: master
 
@@ -96,7 +102,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -124,15 +130,17 @@
                 project-pattern: 'octopus'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw build-docu-verify.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
@@ -176,5 +184,5 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh