X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Foctopus%2Foctopus.yml;h=e44e5ea9325cbfe756223a182d9f86d15c08f28e;hb=d97fb164a5ad276a45319b12be6b7545676d4e78;hp=fe1713c736a604f59da59623d1d9fa271020269c;hpb=028e341af67821f01322c92bcd50885e326f1fd8;p=releng.git

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index fe1713c73..e44e5ea93 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -5,7 +5,7 @@
     name: octopus
     jobs:
         - 'octopus-test'
-        - 'octopus-daily-master'
+        - 'octopus-daily-{stream}'
         - 'octopus-merge'
         - 'octopus-verify-{stream}'
 
@@ -14,8 +14,10 @@
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'octopus'
     somevar: 'foo'
@@ -39,7 +41,7 @@
             echo "Hello world from octopus"
 
 - job-template:
-    name: 'octopus-daily-master'
+    name: 'octopus-daily-{stream}'
 
     node: master
 
@@ -61,26 +63,28 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - octopus-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - 'octopus-{stream}'
 
     prebuilders:
         - test-macro
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
     postbuilders:
         - test-macro
@@ -134,7 +138,7 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
     name: 'octopus-merge'
@@ -184,5 +188,29 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
+
+
+########################
+## parameter macros
+#########################
+- parameter:
+    name: octopus-parameter
+    parameters:
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where the octopus will be stored in gs repository"
+
+#########################
+## trigger macros
+#########################
+- trigger:
+    name: 'octopus-master'
+    triggers:
+        - pollscm: "H 7 * * *"
 
+- trigger:
+    name: 'octopus-stable-arno'
+    triggers:
+        - pollscm: "H 19 * * *"