X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docs.yml;h=307c1db44daf8c3fe68040b7fd3d0944f31c87c8;hb=7ce24497d9d7a727dedd181d8d88d25a0678099d;hp=02b1d9b9991ffcf51a7a6903dfa6d3aa535c1bb4;hpb=1001494d9ae6c9088345daf81dbefb54dafa89ee;p=releng.git

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 02b1d9b99..307c1db44 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,16 +57,16 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '*'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'docs/**'
-                  - compare-type: 'ANT'
-                    pattern: 'yardstick/**'
+                - 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
@@ -68,6 +74,8 @@
 - job-template:
     name: 'opnfv-docs-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -76,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:
@@ -90,17 +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: '*'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'docs/**'
-                  - compare-type: 'ANT'
-                    pattern: 'yardstick/**'
+                - 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