From b58eeb352a855838aa6bfbe06179f414465e917d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 15 Aug 2019 06:33:53 +0200 Subject: [PATCH] Use publish-docs/html Publish to new location for documents to simplify our setup. Depends-On: https://review.opendev.org/676489 Change-Id: I4adf8b1b90bee71bdfbe11affab6c2d18be1ab06 --- tools/build-all-rst.sh | 12 ++++++++---- tox.ini | 12 +++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/build-all-rst.sh b/tools/build-all-rst.sh index af21c69b..50b4bb0d 100755 --- a/tools/build-all-rst.sh +++ b/tools/build-all-rst.sh @@ -1,13 +1,17 @@ #!/bin/bash -e -mkdir -p publish-docs +mkdir -p publish-docs/html # This marker is needed for infra publishing MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID Revision: $ZUUL_NEWREV" doc-tools-build-rst security-guide --build build \ - --target security-guide -echo $MARKER_TEXT > publish-docs/security-guide/.root-marker + --target security-guide +# TODO (AJaeger): Remove once openstack-doc-tools is updated +mv publish-docs/security-guide publish-docs/html +echo $MARKER_TEXT > publish-docs/html/security-guide/.root-marker doc-tools-build-rst security-threat-analysis --build build \ --target security-threat-analysis -echo $MARKER_TEXT > publish-docs/security-threat-analysis/.root-marker +# TODO (AJaeger): Remove once openstack-doc-tools is updated +mv publish-docs/security-threat-analysis publish-docs/html +echo $MARKER_TEXT > publish-docs/html/security-threat-analysis/.root-marker diff --git a/tox.ini b/tox.ini index cd069b0f..a7b1b460 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,7 @@ commands = # Build and copy RST Guides {toxinidir}/tools/build-all-rst.sh # This only generates the index page - openstack-indexpage publish-docs + openstack-indexpage publish-docs/html [testenv:publishdocs] basepython = python3 @@ -46,6 +46,11 @@ commands = basepython = python3 whitelist_externals = doc-tools-check-languages commands = doc-tools-check-languages doc-tools-check-languages.conf test all + # Move from publish-docs to publish-docs/html + # TODO(AJaeger): Remove once openstack-doc-tools is updated + mkdir publish-docs-new + mv publish-docs publish-docs-new/html + mv publish-docs-new publish-docs [testenv:buildlang] basepython = python3 @@ -62,6 +67,11 @@ commands = basepython = python3 whitelist_externals = doc-tools-check-languages commands = doc-tools-check-languages doc-tools-check-languages.conf test all + # Move from publish-docs to publish-docs/html + # TODO(AJaeger): Remove once openstack-doc-tools is updated + mkdir publish-docs-new + mv publish-docs publish-docs-new/html + mv publish-docs-new publish-docs [testenv:docs] basepython = python3