Merge "opnfvdocs: Store colorado.2.0 documents in different location"

[releng.git] / jjb / opnfvdocs / opnfvdocs.yml

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index cbb8f95..2bf87c2 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -16,9 +16,11 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+            disabled: false
+        - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: false
 
 ########################
 # job templates
@@ -27,6 +29,8 @@
 - job-template:
     name: 'opnfvdocs-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -61,18 +65,15 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - build-opnfv-composite-docs
-        - upload-under-review-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
+        - check-bash-syntax
 
 - job-template:
     name: 'opnfvdocs-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -105,15 +106,9 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - build-opnfv-composite-docs
-        - upload-generated-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
-        - remove-old-docs-from-opnfv-artifacts
+        - check-bash-syntax
 
 - job-template:
     name: 'opnfvdocs-daily-{stream}'
@@ -146,13 +141,6 @@
         - timed: '0 H/6 * * *'
 
     builders:
-        - build-opnfv-composite-docs
+        - build-html-and-pdf-docs-output
 #        - upload-generated-docs-to-opnfv-artifacts
 
-- builder:
-    name: build-opnfv-composite-docs
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            export PATH=$PATH:/usr/local/bin/
-            GERRIT_COMMENT=gerrit_comment.txt ./build-composite.sh