Merge "Update dashboard"

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

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index de48aaf..cbb8f95 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -66,8 +66,7 @@
                     pattern: 'docs/**'
 
     builders:
-        - clone-opnfv-repos
-        - build-html-and-pdf-docs-output
+        - build-opnfv-composite-docs
         - upload-under-review-docs-to-opnfv-artifacts
         - report-docs-build-result-to-gerrit
 
@@ -111,15 +110,16 @@
                     pattern: 'docs/**'
 
     builders:
-        - clone-opnfv-repos
-        - build-html-and-pdf-docs-output
-#        - upload-generated-docs-to-opnfv-artifacts
+        - build-opnfv-composite-docs
+        - upload-generated-docs-to-opnfv-artifacts
         - report-docs-build-result-to-gerrit
         - remove-old-docs-from-opnfv-artifacts
 
 - job-template:
     name: 'opnfvdocs-daily-{stream}'
 
+    disabled: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -134,7 +134,7 @@
         - 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:
@@ -146,36 +146,13 @@
         - timed: '0 H/6 * * *'
 
     builders:
-        - clone-opnfv-repos
-        - build-html-and-pdf-docs-output
+        - build-opnfv-composite-docs
 #        - upload-generated-docs-to-opnfv-artifacts
 
 - builder:
-    name: clone-opnfv-repos
+    name: build-opnfv-composite-docs
     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 --branch master --depth 1 --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/docs
-                echo "    $repo"
-                git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --depth 1 --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
+            #!/bin/bash -e
+            export PATH=$PATH:/usr/local/bin/
+            GERRIT_COMMENT=gerrit_comment.txt ./build-composite.sh