X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Foctopus%2Foctopus.yml;h=e11ccc56cbe62433b5fbaf0fac306de2d811b40c;hb=7292ffc71c963b26659f3c67ce24f87054c1efa7;hp=125ba5a0c943e248bdc969aa79a84b12316e4eac;hpb=2d371b271dd95913d46b1a2f179a71a69c548515;p=releng.git

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 125ba5a0c..e11ccc56c 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -1,17 +1,29 @@
+################################
+# job configuration for Octopus
+################################
 - project:
     name: octopus
     jobs:
         - 'octopus-test'
-        - 'octopus-daily-master'
+        - 'octopus-daily-{stream}'
+        - 'octopus-merge-{stream}'
+        - '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'
+            gs-pathname: ''
+        - stable-arno:
+            branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'octopus'
     somevar: 'foo'
+###############################
+# job templates
+###############################
 
 - job-template:
     name: octopus-test
@@ -29,7 +41,9 @@
             echo "Hello world from octopus"
 
 - job-template:
-    name: 'octopus-daily-master'
+    name: 'octopus-daily-{stream}'
+
+    node: master
 
     # Job template for daily builders
     #
@@ -46,21 +60,157 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - octopus-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - 'octopus-{stream}'
 
     prebuilders:
         - test-macro
 
     builders:
-        - shell: |
-            echo "Hello world from octopus {somevar} daily"
-        - test-macro
+        - shell:
+            !include-raw ../opnfvdocs/docu-build.sh
 
     postbuilders:
         - test-macro
 
+- job-template:
+    name: 'octopus-verify-{stream}'
+
+    node: master
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'octopus'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+
+    builders:
+        - shell:
+            !include-raw ../opnfvdocs/docu-build.sh
+
+- job-template:
+    name: 'octopus-merge-{stream}'
+
+    node: master
+
+    # builder-merge job to run JJB update
+    #
+    # This job's purpose is to update all the JJB
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 40
+        artifactDaysToKeep: -1
+        artifactNumToKeep: 5
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'octopus'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+
+    builders:
+        - shell:
+            !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 * * *"