openstack/api-site
Code Issues Proposed changes

Switch publishing to publish-docs/html

Browse Source 
This allows simplifying the CI jobs.

Depends-On: https://review.opendev.org/676489
Change-Id: If363e5b0f16cd126dd9ddb5e23e4762d9496ef79
This commit is contained in:
Andreas Jaeger 2019-08-15 06:38:13 +02:00
parent 7066bc1fb4
commit 8a82b1445a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/build-index.sh
View File

@ -19,29 +19,29 @@ if [[ -z "$PUBLISH" ]] ; then
exit 1
fi
mkdir -p publish-docs
mkdir -p publish-docs/html
# Build the www pages so that openstack-doc-test creates a link to
# www/www-index.html.
if [ "$PUBLISH" = "build" ] ; then
python tools/www-generator.py --source-directory www/ \
--output-directory publish-docs/www/
rsync -a www/static/ publish-docs/www/
# publish-docs/www-index.html is the trigger for openstack-doc-test
--output-directory publish-docs/html/www/
rsync -a www/static/ publish-docs/html/www/
# publish-docs/html/www-index.html is the trigger for openstack-doc-test
# to include the file.
mv publish-docs/www/www-index.html publish-docs/www-index.html
mv publish-docs/html/www/www-index.html publish-docs/html/www-index.html
# Create index page for viewing
openstack-indexpage publish-docs
openstack-indexpage publish-docs/html
fi
if [ "$PUBLISH" = "publish" ] ; then
python tools/www-generator.py --source-directory www/ \
--output-directory publish-docs/
rsync -a www/static/ publish-docs/
--output-directory publish-docs/html/
rsync -a www/static/ publish-docs/html/
# Don't publish this file
rm publish-docs/www-index.html
rm publish-docs/html/www-index.html
# This marker is needed for infra publishing
MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID"
echo $MARKER_TEXT > publish-docs/.root-marker
echo $MARKER_TEXT > publish-docs/html/.root-marker
fi

2
tools/www-generator.py
View File

@ -53,7 +53,7 @@ def parse_command_line_arguments():
parser.add_argument("--source-directory", type=str,
default='www', help='')
parser.add_argument("--output-directory", type=str,
default='publish-docs/www', help='')
default='publish-docs/html/www', help='')
return parser.parse_args()