openstack
/
security-doc
Code Issues Proposed changes

Use publish-docs/html 

Publish to new location for documents to simplify our setup.

Depends-On: https://review.opendev.org/676489
Change-Id: I4adf8b1b90bee71bdfbe11affab6c2d18be1ab06
This commit is contained in:
Andreas Jaeger 2019-08-15 06:33:53 +02:00
parent 60d6900f65
commit b58eeb352a
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/build-all-rst.sh
View File

@ -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

12
tox.ini
View File

@ -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