X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docs.yml;h=442e8ea71317e210876f3afb6b3e63959573a607;hb=3bc7e1c06b95bcc16fc5d7013e9d7d971a497fda;hp=2b3f98a4efa3b797dede144b0cda2e50e92e01ed;hpb=c1886f0bbaaffc2a40a658ed3b5cc5e71cf49909;p=releng.git

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 2b3f98a4e..442e8ea71 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -14,10 +14,14 @@
     stream:
         - master:
             branch: '{stream}'
+            doc-version: ''
             gs-pathname: ''
-        - brahmaputra:
+            disabled: false
+        - colorado:
             branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
+            doc-version: '3.0'
+            gs-pathname: '/{stream}/{doc-version}'
+            disabled: false
 
 ########################
 # job templates
@@ -26,6 +30,8 @@
 - job-template:
     name: 'opnfv-docs-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -51,15 +57,16 @@
                 - 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|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
+                - project-compare-type: 'ANT'
+                  project-pattern: '*'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: ANT
+                        pattern: docs/**
+                      - compare-type: ANT
+                        pattern: yardstick/**
 
     builders:
         - upload-review-docs
@@ -67,6 +74,8 @@
 - job-template:
     name: 'opnfv-docs-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -75,7 +84,11 @@
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
-            description: "Directory where the build artifact will be located upon the completion     of the build."
+            description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: GERRIT_REFSPEC
+            default: 'refs/heads/{branch}'
+            description: "JJB configured GERRIT_REFSPEC parameter"
 
     scm:
         - gerrit-trigger-scm:
@@ -89,15 +102,19 @@
                 - change-merged-event
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
+                - comment-added-contains-event:
+                    comment-contains-value: 'rebuild docs'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'vswitchperf|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
+                - project-compare-type: 'ANT'
+                  project-pattern: '*'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: ANT
+                        pattern: docs/**
+                      - compare-type: ANT
+                        pattern: yardstick/**
 
     builders:
         - upload-merged-docs