X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docs.yml;h=0ac8aa7e01e4fdd465dd51b91c3e343743d433e7;hb=2a660565e4051364128555ed97c047832fe39cad;hp=7eaa5f8ab61e44d0a423cd9fabbd4247212465a9;hpb=e3301f14105c7137e568252543df35afb4c16ff5;p=releng.git

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 7eaa5f8ab..0ac8aa7e0 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: '2.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,19 +57,16 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '(?!yardstick)'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-              - project-compare-type: 'PLAIN'
-                project-pattern: 'yardstick'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+                - 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
@@ -71,6 +74,8 @@
 - job-template:
     name: 'opnfv-docs-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -79,7 +84,7 @@
         - 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."
 
     scm:
         - gerrit-trigger-scm:
@@ -94,19 +99,16 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '(?!yardstick)'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-              - project-compare-type: 'PLAIN'
-                project-pattern: 'yardstick'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
+                - 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