X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng-macros.yaml;h=3afe8482a143c1cd38845e8424206b67778df51e;hb=19852f3337812c944906b8427cd81fd3480fb859;hp=1f091b9732eb87b1993d7d1c2f278ed86608f727;hpb=d71ea5fba2ad0ff933d9e8301953e5205c851bf4;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1f091b973..3afe8482a 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -159,15 +159,25 @@
 
             _get_title_script="
             import os
-            from docutils import core
+            from docutils import core, nodes
             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()"
+            doctree = core.publish_doctree(data,
+                settings_overrides={'report_level': 5,
+                                    'halt_level': 5})
+            if isinstance(doctree[0], nodes.title):
+                title = doctree[0]
+            else:
+                for c in doctree.children:
+                    if isinstance(c, nodes.section):
+                        title = c[0]
+                        break
+            print title.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##*/}"
@@ -183,11 +193,11 @@
                 sed -i "s/_sha1_/$_git_sha1/g" "$dir/index.rst"
 
                 if [[ ! -f "$dir/conf.py" ]] ; then
-                    cp "docs/etc/conf.py" "$dir/conf.py"
+                    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"
+                    echo "latex_documents = [('index', '$_name.tex', \"$_title\", 'OPNFV', 'manual'),]" >> "$dir/conf.py"
                 fi
-                cp -f "docs/etc/opnfv-logo.png" "$dir/opnfv-logo.png"
+                cp -f releng/docs/etc/opnfv-logo.png "$dir/opnfv-logo.png"
 
                 mkdir -p "$_output"
 
@@ -227,9 +237,12 @@
             echo "###########################"
             echo
 
-            gs_path="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
+            gs_base="artifacts.opnfv.org/review"
+            gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
+            local_path="docs/$GERRIT_CHANGE_NUMBER"
 
-            gsutil -m cp -r docs/output "gs://$gs_path"
+            mv docs/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
                 gsutil -m setmeta \
@@ -239,8 +252,8 @@
             fi
 
             echo "Document link(s):" >> gerrit_comment.txt
-            find docs/output | grep -e 'index.html$' -e 'pdf$' | \
-                sed -e "s|^docs/output|    http://$gs_path|" >> gerrit_comment.txt
+            find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
+                sed -e "s|^$local_path|    http://$gs_path|" >> gerrit_comment.txt
 
 - builder:
     name: upload-merged-docs-to-opnfv-artifacts
@@ -259,12 +272,15 @@
             echo
 
             if [[ "$GERRIT_BRANCH" == "master" ]] ; then
-                gs_path="artifacts.opnfv.org/$GERRIT_PROJECT/docs"
+                gs_base="artifacts.opnfv.org/$GERRIT_PROJECT"
             else
-                gs_path="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH/docs"
+                gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH"
             fi
+            gs_path="$gs_base/docs"
+            local_path="docs/docs"
 
-            gsutil -m cp -r docs/output/* "gs://$gs_path"
+            mv docs/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
                 gsutil -m setmeta \
@@ -274,8 +290,8 @@
             fi
 
             echo "Document link(s):" >> gerrit_comment.txt
-            find docs/output | grep -e 'index.html$' -e 'pdf$' | \
-                sed -e "s|^docs/output|    http://$gs_path|" >> gerrit_comment.txt
+            find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
+                sed -e "s|^$local_path|    http://$gs_path|" >> gerrit_comment.txt
 
 - builder:
     name: report-docs-build-result-to-gerrit