From 175cf89703bc982ff371b208a4309d5a14bb9561 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 14 Feb 2014 17:41:55 +0100
Subject: [PATCH] Set up for publishing via openstack-doc-tools

tox -e publishdocs will be called by the post jenkins jobs to prepare
everything for publishing - and then the content of publish-docs
gets copied.

Additionally, remove some parameter from openstack-doc-tools invocation,
they are now set in doc-test.conf.

Change-Id: I4002ceec14608666ef14804f81a5edb95803d74b
---
 doc-test.conf |  7 ++++++-
 tox.ini       | 13 +++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc-test.conf b/doc-test.conf
index c043ccef..61bb0f35 100644
--- a/doc-test.conf
+++ b/doc-test.conf
@@ -2,8 +2,13 @@
 repo_name = identity-api
 api_site = True
 
-# These two options need to come as pairs:
+# These three options need to come together
 book = v2.0
 target_dir = target/docbkx/webhelp/api/openstack-identity-service/2.0
+# Published at http://docs.openstack.org/api/openstack-identity-service/2.0/
+publish_dir = api/openstack-identity-service/2.0
+
 book = v3
 target_dir = target/docbkx/webhelp/api/openstack-identity-service/3
+# Published on http://docs.openstack.org/api/openstack-identity-service/3
+publish_dir = api/openstack-identity-service/3
diff --git a/tox.ini b/tox.ini
index 33bb1dab..11fb53ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,13 +12,18 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
 [testenv:checkniceness]
-commands = openstack-doc-test  --api-site --check-niceness {posargs}
+commands = openstack-doc-test --check-niceness {posargs}
 
 [testenv:checksyntax]
-commands = openstack-doc-test  --api-site --check-syntax {posargs}
+commands = openstack-doc-test --check-syntax {posargs}
 
 [testenv:checkdeletions]
-commands = openstack-doc-test  --api-site --check-deletions {posargs}
+commands = openstack-doc-test --check-deletions {posargs}
 
 [testenv:checkbuild]
-commands = openstack-doc-test  --api-site --check-build {posargs}
+commands = openstack-doc-test --check-build {posargs}
+
+[testenv:publishdocs]
+# Prepare all documents so that they can get published on
+# docs.openstack.org with just copying publish-docs/* over.
+commands = openstack-doc-test --check-build --nocreate-index --force