X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=f9cb95209d6fa8bb15a06ab389e9ec2dd2096428;hb=9c1669b0db7698f67da9346bc2d93e0205ba1ecc;hp=1f3da79ba273dc5d560ca0924a04a55abfb4c43f;hpb=f179b48beb37fb4529dad8d919b530d26c779172;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1f3da79ba..f9cb95209 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -152,66 +152,9 @@
     builders:
         - shell: |
             #!/bin/bash -e
-            set -o pipefail
             export PATH=$PATH:/usr/local/bin/
-
-            [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-
-            _get_title_script="
-            import os
-            from docutils import core
-            with open('index.rst', 'r') as file:
-                data = file.read()
-                doctree = core.publish_doctree(data,
-                    settings_overrides={'report_level': 5,
-                                        'halt_level': 5})
-                print doctree[0].astext()"
-            _git_sha1="$(git rev-parse HEAD)"
-
             git clone ssh://gerrit.opnfv.org:29418/releng
-            [[ -d releng ]]
-
-            find docs/ -name 'index.rst' -printf '%h\n' | while read dir
-            do
-                _name="${dir##*/}"
-                _build="$dir/build"
-                _output="docs/output/$_name"
-
-                echo
-                echo "#################${dir//?/#}"
-                echo "Building DOCS in $dir"
-                echo "#################${dir//?/#}"
-                echo
-
-                sed -i "s/_sha1_/$_git_sha1/g" "$dir/index.rst"
-
-                if [[ ! -f "$dir/conf.py" ]] ; then
-                    cp releng/docs/etc/conf.py "$dir/conf.py"
-                    _title=$(cd $dir; python -c "$_get_title_script")
-                    echo "latex_documents = [('index', '$_name.tex', '$_title', 'OPNFV', 'manual'),]" >> "$dir/conf.py"
-                fi
-                cp -f releng/docs/etc/opnfv-logo.png "$dir/opnfv-logo.png"
-
-                mkdir -p "$_output"
-
-                sphinx-build -b html -E "$dir" "$_output"
-
-                # Note: PDF creation may fail in project doc builds.
-                #       We allow this test to be marked as succeeded with
-                #       failure in PDF creation, but leave message to fix it.
-                #       Any failure has to be fixed before B release.
-                {
-                    sphinx-build -b latex -E "$dir" "$_build"
-                    make -C "$_build" LATEXOPTS='--interaction=nonstopmode' all-pdf
-                    mv "$_build/$_name.pdf" "$_output"
-                } || {
-                    _msg="Error: PDF creation for $dir has failed, please fix source rst file(s)."
-                    echo
-                    echo "$_msg"
-                    echo
-                    echo "$_msg" >> gerrit_comment.txt
-                }
-            done
+            GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
 
 - builder:
     name: upload-under-review-docs-to-opnfv-artifacts
@@ -222,7 +165,7 @@
             export PATH=$PATH:/usr/local/bin/
 
             [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-            [[ -d docs/output ]]
+            [[ -d output ]]
 
             echo
             echo "###########################"
@@ -232,9 +175,10 @@
 
             gs_base="artifacts.opnfv.org/review"
             gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
-            local_path="docs/$GERRIT_CHANGE_NUMBER"
+            local_path="upload/$GERRIT_CHANGE_NUMBER"
 
-            mv docs/output "$local_path"
+            mkdir -p upload
+            mv output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$gs_base"
 
             if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
@@ -256,7 +200,7 @@
             set -o pipefail
             export PATH=$PATH:/usr/local/bin/
 
-            [[ -d docs/output ]]
+            [[ -d output ]]
 
             echo
             echo "#####################"
@@ -270,9 +214,10 @@
                 gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH"
             fi
             gs_path="$gs_base/docs"
-            local_path="docs/docs"
+            local_path="upload/docs"
 
-            mv docs/output "$local_path"
+            mkdir -p upload
+            mv output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$gs_base"
 
             if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then