X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fopnfvdocs.yml;h=cf7bae5b30e94181ed6eebca868e47a59c45532e;hb=561f07f890e3bccd1776da79e5b44a1a903a7693;hp=b6b0b1caabd93681fc9bb9d694c4184bb9f6ca53;hpb=ce27221722b8ff15702e2884e839e4a39a4216e7;p=releng.git

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index b6b0b1caa..cf7bae5b3 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -16,9 +16,11 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+            disabled: false
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: true
 
 ########################
 # job templates
@@ -27,6 +29,8 @@
 - job-template:
     name: 'opnfvdocs-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -38,13 +42,11 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -61,19 +63,15 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - clone-opnfv-repos
-        - build-html-and-pdf-docs-output
-#        - 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
@@ -89,13 +87,11 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -106,20 +102,15 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - clone-opnfv-repos
-        - build-html-and-pdf-docs-output
-#        - 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}'
 
+    disabled: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -134,48 +125,15 @@
         - string:
             name: GERRIT_BRANCH
             default: '{branch}'
-            description: 'Specify the branch in this way in order to be able to use clone-opnfv-repos builder.'
+            description: 'Specify the branch in this way in order to be able to use build-opnfv-composite-docs builder.'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - timed: '0 H/6 * * *'
 
     builders:
-        - clone-opnfv-repos
         - build-html-and-pdf-docs-output
 #        - upload-generated-docs-to-opnfv-artifacts
 
-- builder:
-    name: clone-opnfv-repos
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            # clone releng repo to get repo list
-            cd $WORKSPACE
-            echo "Cloning releng repo"
-            git clone $GIT_CLONE_BASE/releng --quiet
-
-            # clone rest of the repos and checkout the branch
-            echo "Cloning repos of participating OPNFV Projects and checking out $GERRIT_BRANCH"
-            echo
-            echo "--------------------------------------------------------"
-            for repo in $(grep -v '^#' $WORKSPACE/releng/jjb/opnfvdocs/project.cfg | sort); do
-                cd $WORKSPACE
-                echo "    $repo"
-                git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --quiet
-            done
-            echo "--------------------------------------------------------"
-            echo
-            echo "Done"
-
-            # remove releng clone in order not to cause issues for rest of the builders
-            /bin/rm -rf $WORKSPACE/releng