X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docs.yml;h=0c11757ecc5f0897623dff70fb2b44165d806f0a;hb=6c455833a45da8feac06885a334a199ee23a84b3;hp=ee4b5d75c23b89ee2d225cf4b286684f09c9486e;hpb=fcd9e820361be9dbf31481185e11e4a8aebc40f7;p=releng.git

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index ee4b5d75c..0c11757ec 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -8,37 +8,29 @@
     project: opnfv-docs
 
     jobs:
-        - 'opnfv-docs-verify'
-        - 'opnfv-docs-merge'
+        - 'opnfv-docs-verify-{stream}'
+        - 'opnfv-docs-merge-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-arno)
-    # branch:    branch (eg. stable/arno)
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+            gs-pathname: ''
+        - brahmaputra:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'opnfv-docs-verify'
-
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    name: 'opnfv-docs-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -46,10 +38,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -63,40 +51,35 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'REG_EXP'
-#Left out arno projects oscar|octopus|functest|genesis
-                project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs'
+              - project-compare-type: 'ANT'
+                project-pattern: '(?!yardstick)'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
+              - project-compare-type: 'ANT'
+                project-pattern: 'yardstick'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     builders:
-        - build-html-and-pdf-docs-output
-
-    publisher:
-        - upload-under-review-docs-to-opnfv-artifacts
+        - upload-review-docs
 
 - job-template:
-    name: 'opnfv-docs-merge'
-
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    name: 'opnfv-docs-merge-{stream}'
 
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion     of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -104,10 +87,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -115,18 +94,19 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs'
+              - project-compare-type: 'ANT'
+                project-pattern: '(?!yardstick)'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
+              - project-compare-type: 'ANT'
+                project-pattern: 'yardstick'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     builders:
-        - build-html-and-pdf-docs-output
-
-    publisher:
-        - upload-merged-docs-to-opnfv-artifacts
-        - remove-old-docs-from-opnfv-artifacts
+        - upload-merged-docs