merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 87648c1..1295033 100644 (file)
--- 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,10 +29,11 @@
 - job-template:
     name: 'opnfvdocs-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_CLONE_BASE
@@ -38,13 +41,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,23 +62,18 @@
                 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
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_CLONE_BASE
@@ -89,13 +85,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,23 +100,19 @@
                 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}'
+            branch: '{branch}'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -131,77 +121,13 @@
             name: GIT_CLONE_BASE
             default: ssh://gerrit.opnfv.org:29418
             description: "Used for overriding the GIT URL coming from parameters macro."
-        - string:
-            name: GERRIT_BRANCH
-            default: '{branch}'
-            description: 'Specify the branch in this way in order to be able to use clone-opnfv-repos 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
-
-    # TODO(r-mibu): fix job name which is not relevant anymore
-    #               AND move this script into opnfvdocs repo
-
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o nounset
-            set -o pipefail
-
-            tmp=$WORKSPACE/composite_tmp
-            [[ -d $tmp ]] && rm -rf $tmp
-            mkdir -p $tmp
-            mkdir -p $WORKSPACE/docs/projects
-
-            pushd $tmp
-
-            # clone releng repo to get repo list
-            echo "Cloning releng repo"
-            git clone $GIT_CLONE_BASE/releng --branch master --depth 1 --quiet
-            repos=$(grep -v '^#' $WORKSPACE/releng/jjb/opnfvdocs/project.cfg | sort)
-
-            echo
-            echo "Cloning repos of participating OPNFV Projects and copying docs"
-            echo
-            echo "--------------------------------------------------------"
-            for repo in $repos; do
-                echo "    $repo ($GERRIT_BRANCH)"
-                git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --depth 1 --quiet
-                cp -r $repo/docs $WORKSPACE/docs/projects/$repo
-            done
-            echo "--------------------------------------------------------"
-            echo
-
-            echo "Creating document links"
-            for guide in configguide userguide
-            do
-                link_list=$WORKSPACE/docs/$guide/projects-$guide.rst
-                for repo in $repos
-                do
-                    file=projects/$repo/$guide/$guide.rst
-                    [[ -e $WORKSPACE/docs/$file ]] || continue
-                    echo "" >> $link_list
-                    echo "$repo:" >> $link_list
-                    echo ".. include:: ../$file" >> $link_list
-                done
-            done
-
-            popd
-            rm -rf $tmp
-
-            echo "Done"