From 9b0740f0987e1aaaede130591b6b12c61f98e1d9 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 13 Apr 2015 14:04:46 +0200 Subject: [PATCH] Publish to /draft/ instead of /trunk Publish Install Guide to docs.openstack.org/draft/install-guide Publish Networking Guide to docs.openstack.org/draft/networking-guide Publish Configuration Reference to /draft as well. Update link /trunk/index.html Partial implements bp draft-publishing Change-Id: I620339c45e07bc492328f8df908e7b9f5f5ef9fa --- doc-test.conf | 3 +++ tox.ini | 10 ++++++++-- www/trunk/index.html | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc-test.conf b/doc-test.conf index df3ed3fdde..b8719d516e 100644 --- a/doc-test.conf +++ b/doc-test.conf @@ -1,6 +1,9 @@ [DEFAULT] repo_name = openstack-manuals +# Publish to /draft instead of /trunk +release_path = draft + url-exception = https://build.opensuse.org/package/show?package=python-pip&project=Cloud:OpenStack:Master # These files are not in DocBook format: diff --git a/tox.ini b/tox.ini index 83a9a7565e..b2e1100afd 100644 --- a/tox.ini +++ b/tox.ini @@ -83,8 +83,8 @@ commands = # not publish anything. mkdir publish-docs # We only publish changed manuals. - # Do not publish Install Guide and DocBook XML Networking Guide - openstack-doc-test --check-build --ignore-book install-guide --ignore-book networking-guide --publish + # Do not publish DocBook XML Networking Guide + openstack-doc-test --check-build --ignore-book networking-guide --publish # Build both RST User Guides {toxinidir}/tools/build-user-guides.sh # Copy RST user-guide @@ -93,6 +93,12 @@ commands = # Copy RST user-guide-admin mkdir -p publish-docs/user-guide-admin/ rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/ + # Build RST Networking Guide + {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst + sphinx-build -W doc/networking-guide/source doc/networking-guide/build/html + # Copy RST Networking Guide as draft + mkdir -p publish-docs/draft/networking-guide/ + rsync -a doc/networking-guide/build/html/ publish-docs/draft/networking-guide/ # Now publish www as well, we cannot do this from # openstack-doc-test. Use rsync so that .htaccess gets also # copied. diff --git a/www/trunk/index.html b/www/trunk/index.html index a0521af3f4..d986d9c56f 100644 --- a/www/trunk/index.html +++ b/www/trunk/index.html @@ -92,7 +92,7 @@