diff options
Diffstat (limited to 'jjb/releng-macros.yaml')
| -rw-r--r-- | jjb/releng-macros.yaml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 8d6f55193..9d6a54260 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -201,7 +201,7 @@ sed -e "s|^$local_path| http://$gs_path|" >> gerrit_comment.txt - builder: - name: upload-merged-docs-to-opnfv-artifacts + name: upload-generated-docs-to-opnfv-artifacts builders: - shell: | #!/bin/bash -e @@ -211,22 +211,17 @@ [[ -d output ]] echo - echo "#####################" - echo "UPLOADING MERGED DOCS" - echo "#####################" + echo "########################" + echo "UPLOADING GENERATED DOCS" + echo "########################" echo - if [[ "$GERRIT_BRANCH" == "master" ]] ; then - gs_base="artifacts.opnfv.org/$GERRIT_PROJECT" - else - gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH" - fi - gs_path="$gs_base/docs" + gs_path="$GS_URL/docs" local_path="upload/docs" mkdir -p upload mv output "$local_path" - gsutil -m cp -r "$local_path" "gs://$gs_base" + gsutil -m cp -r "$local_path" "gs://$GS_URL" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then gsutil -m setmeta \ @@ -285,6 +280,6 @@ name: upload-merged-docs builders: - build-html-and-pdf-docs-output - - upload-merged-docs-to-opnfv-artifacts + - upload-generated-docs-to-opnfv-artifacts - report-docs-build-result-to-gerrit - remove-old-docs-from-opnfv-artifacts |