X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=b94fd8fa23853ee00128b456585ecbc005100302;hb=3ab65d1960a92cde21ec764fdc57b7347527e96e;hp=d83bf7fca41ff3ef470513e3c66db061d1e30d56;hpb=a41a53e505ddaaae8cd8f03746bc0ef38d748ec4;p=releng.git diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index d83bf7fca..b94fd8fa2 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -7,6 +7,14 @@ name: PROJECT default: '{project}' description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project" + - string: + name: GS_BASE + default: artifacts.opnfv.org/$PROJECT/ + description: "URL to Google Storage." + - string: + name: GS_BASE_PROXY + default: build.opnfv.org/artifacts/$PROJECT/ + description: "URL to Google Storage proxy" - parameter: name: gerrit-parameter @@ -144,89 +152,63 @@ builders: - shell: 'mkdir -p $WORKSPACE/target/classes' + +# New Releng macros + - builder: name: build-html-and-pdf-docs-output builders: - shell: | #!/bin/bash -e - set -o pipefail export PATH=$PATH:/usr/local/bin/ + git clone ssh://gerrit.opnfv.org:29418/releng + GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh - [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - - git_sha1="$(git rev-parse HEAD)" - - find docs/ -type f -iname '*.rst' -print0 | while read file - do - sed -i "s/_sha1_/$git_sha1/g" "$file" - done - - 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 - - mkdir -p "$_output" - - sphinx-build -b html -E -c docs/etc "$dir" "$_output" - - sphinx-build -b latex -E -c docs/etc "$dir" "$_build" - make -C "$_build" LATEXOPTS='--interaction=nonstopmode' all-pdf - mv "$_build"/*.pdf "$_output" - done - -- publisher: +- builder: name: upload-under-review-docs-to-opnfv-artifacts - publishers: + builders: - shell: | #!/bin/bash -e set -o pipefail export PATH=$PATH:/usr/local/bin/ [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - [[ -d docs/output ]] + [[ -d output ]] echo - echo "##########################" - echo "UPLOADING DOCS UNER REVIEW" - echo "##########################" + echo "###########################" + echo "UPLOADING DOCS UNDER REVIEW" + 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="upload/$GERRIT_CHANGE_NUMBER" - gsutil cp -r docs/output/* "gs://$gs_path" + mkdir -p upload + mv output "$local_path" + gsutil -m cp -r "$local_path" "gs://$gs_base" - gsutil ls "gs://$gs_path" | grep -e 'html$' | while read file - do - gsutil setmeta \ + if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then + gsutil -m setmeta \ -h "Content-Type:text/html" \ -h "Cache-Control:private, max-age=0, no-transform" \ - "$file" - done + "gs://$gs_path"/**.html + fi - gerrit_comment="Document link(s): - $(gsutil ls "gs://$gs_path" | grep -e 'index.html$' -e 'pdf$' | sed 's/^gs/http/')" - echo - echo "$gerrit_comment" - echo - {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION + echo "Document link(s):" >> gerrit_comment.txt + find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \ + sed -e "s|^$local_path| http://$gs_path|" >> gerrit_comment.txt -- publisher: +- builder: name: upload-merged-docs-to-opnfv-artifacts - publishers: + builders: - shell: | #!/bin/bash -e set -o pipefail export PATH=$PATH:/usr/local/bin/ - [[ -d docs/output ]] + [[ -d output ]] echo echo "#####################" @@ -234,32 +216,50 @@ echo "#####################" echo - if [[ "{branch}" == "master" ]] ; then - gs_path="artifacts.opnfv.org/{project}/docs" + if [[ "$GERRIT_BRANCH" == "master" ]] ; then + gs_base="artifacts.opnfv.org/$GERRIT_PROJECT" else - gs_path="artifacts.opnfv.org/{project}/{branch}/docs" + gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH" fi + gs_path="$gs_base/docs" + local_path="upload/docs" - gsutil cp -r docs/output/* "gs://$gs_path" + mkdir -p upload + mv output "$local_path" + gsutil -m cp -r "$local_path" "gs://$gs_base" - gsutil ls "gs://$gs_path" | grep -e 'html$' | while read file - do - gsutil setmeta \ + if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then + gsutil -m setmeta \ -h "Content-Type:text/html" \ -h "Cache-Control:private, max-age=0, no-transform" \ - "$file" - done + "gs://$gs_path"/**.html + fi - gerrit_comment="Document link(s): - $(gsutil ls "gs://$gs_path" | grep -e 'index.html$' -e 'pdf$' | sed 's/^gs/http/')" - echo - echo "$gerrit_comment" - echo - {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION + echo "Document link(s):" >> gerrit_comment.txt + find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \ + sed -e "s|^$local_path| http://$gs_path|" >> gerrit_comment.txt -- publisher: +- builder: + name: report-docs-build-result-to-gerrit + builders: + - shell: | + #!/bin/bash -e + export PATH=$PATH:/usr/local/bin/ + if [[ -e gerrit_comment.txt ]] ; then + echo + echo "posting review comment to gerrit..." + echo + cat gerrit_comment.txt + echo + ssh -p 29418 gerrit.opnfv.org \ + "gerrit review -p $GERRIT_PROJECT \ + -m '$(cat gerrit_comment.txt)' \ + $GERRIT_PATCHSET_REVISION" + fi + +- builder: name: remove-old-docs-from-opnfv-artifacts - publishers: + builders: - shell: | #!/bin/bash -e export PATH=$PATH:/usr/local/bin/ @@ -271,5 +271,20 @@ if gsutil ls "gs://$gs_path" > /dev/null 2>&1 ; then echo echo "Deleting Out-of-dated Documents..." - gsutil rm -r "gs://$gs_path_review" + gsutil -m rm -r "gs://$gs_path" fi + +- builder: + name: upload-review-docs + builders: + - build-html-and-pdf-docs-output + - upload-under-review-docs-to-opnfv-artifacts + - report-docs-build-result-to-gerrit + +- builder: + name: upload-merged-docs + builders: + - build-html-and-pdf-docs-output + - upload-merged-docs-to-opnfv-artifacts + - report-docs-build-result-to-gerrit + - remove-old-docs-from-opnfv-artifacts