Merge "Update RST building"

This commit is contained in:
Jenkins 2017-07-21 19:29:33 +00:00 committed by Gerrit Code Review
commit a298aa5891
3 changed files with 3 additions and 57 deletions

View File

@ -29,11 +29,11 @@ done
# PDF targets for Install guides are dealt in build-install-guides-rst.sh
PDF_TARGETS=( 'arch-design'\
'ha-guide' \
'image-guide')
'image-guide' \
'install-guide')
# Note that these guides are only build for master branch
for guide in arch-design contributor-guide \
ha-guide image-guide; do
ha-guide ha-guide-draft image-guide install-guide; do
if [[ ${PDF_TARGETS[*]} =~ $guide ]]; then
tools/build-rst.sh doc/$guide --build build \
--target $guide $LINKCHECK $PDF_OPTION
@ -43,22 +43,6 @@ for guide in arch-design contributor-guide \
fi
done
# Draft guides
# This includes guides that we publish from stable branches
# as versioned like the ha-guide
for guide in ha-guide-draft; do
TARGET="$guide"
if [[ ${PDF_TARGETS[*]} =~ $guide ]]; then
tools/build-rst.sh doc/$guide --build build \
--target "$TARGET" $LINKCHECK $PDF_OPTION
else
tools/build-rst.sh doc/$guide --build build \
--target "$TARGET" $LINKCHECK
fi
done
tools/build-install-guides-rst.sh $LINKCHECK $PDF_OPTION
# For master, just mark the root
if [ "$ZUUL_REFNAME" = "master" ] ; then
echo $MARKER_TEXT > publish-docs/.root-marker

View File

@ -1,34 +0,0 @@
#!/bin/bash -e
mkdir -p publish-docs
# Do not build debian debconf for now, there're no Ocata packages at all.
INDEX=doc/install-guide/source/index.rst
LINKCHECK=""
PDF_OPTION=""
while [[ $# > 0 ]] ; do
option="$1"
case $option in
--linkcheck)
LINKCHECK="--linkcheck"
;;
--pdf)
PDF_OPTION="--pdf"
;;
esac
shift
done
# Set this to a sensible value if not set by OpenStack CI.
if [ -z "$ZUUL_REFNAME" ] ; then
ZUUL_REFNAME="master"
fi
# This marker is needed for infra publishing.
# Note for stable branches, this needs to be the top of each manual.
MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID Revision: $ZUUL_NEWREV"
# Build the guide
tools/build-rst.sh doc/install-guide \
--target "install-guide" $LINKCHECK $PDF_OPTION

View File

@ -41,10 +41,6 @@ commands =
commands =
{toxinidir}/tools/build-all-rst.sh --pdf
[testenv:install-guides]
commands =
{toxinidir}/tools/build-install-guides-rst.sh {posargs}
[testenv:install-guide-debconf]
commands =
{toxinidir}/tools/build-install-guides-rst.sh debconf {posargs}