From a9f1fb28a07ede38190526014c164a4b442b1f09 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 28 Apr 2015 21:03:21 +0200
Subject: [PATCH] Publish for Kilo

Copy over the Config Ref and Install Guide to kilo locations until
we branch of Kilo.

Publish networking guide continously.

Change-Id: Icdd1c5a841b804309e4c04f03c7b5607d670719e
---
 doc/config-reference/bk-config-ref.xml           |  4 +++-
 doc/install-guide/bk-openstack-install-guide.xml |  4 +++-
 tox.ini                                          | 14 +++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/config-reference/bk-config-ref.xml b/doc/config-reference/bk-config-ref.xml
index 19ce4f3795..44fdd37a2a 100644
--- a/doc/config-reference/bk-config-ref.xml
+++ b/doc/config-reference/bk-config-ref.xml
@@ -3,8 +3,10 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="bk-openstack-config-reference"
+  xml:id="bk-openstack-config-reference">
+<!--- TODO(jaegerandi) Add back to the above once Kilo has branched:
   status="draft">
+-->
     <title>OpenStack Configuration Reference</title>
     <?rax
       status.bar.text.font.size="40px"
diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml
index c3ce9fb2de..ed958a5434 100644
--- a/doc/install-guide/bk-openstack-install-guide.xml
+++ b/doc/install-guide/bk-openstack-install-guide.xml
@@ -3,8 +3,10 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="openstack-install-manual"
+  xml:id="openstack-install-manual">
+  <!-- TODO(jaegerandi) Add back to the above once Kilo has branched:
   status="draft">
+  -->
     <title>OpenStack Installation Guide for
         <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</phrase>
         <phrase os="ubuntu">Ubuntu 14.04</phrase>
diff --git a/tox.ini b/tox.ini
index e6ca69de98..0775572219 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,6 +86,14 @@ commands =
   # We only publish changed manuals.
   # Do not publish DocBook XML Networking Guide
   openstack-doc-test --check-build --ignore-book networking-guide --publish
+  # TODO(jaegerandi): Remove the following lines before we branch off
+  # a kilo branch.
+  # Publish install-guide and config-reference to /kilo
+  cp -a publish-docs/draft publish-docs/kilo
+  # Replace links to /draft with links to /kilo/
+  # This needs bash so that tox does not interpret the *
+  bash -c "sed -i -e 's|/draft/|/kilo/|g' publish-docs/kilo/*/atom.xml publish-docs/kilo/*/*/*/atom.xml publish-docs/kilo/*/*.html publish-docs/kilo/*/*/*/*/*.html publish-docs/kilo/*/*/*/*.html publish-docs/kilo/*/*/*.html publish-docs/kilo/*/*.html"
+  # END Kilo duplication.
   # Build both RST User Guides
   {toxinidir}/tools/build-user-guides.sh
   # Copy RST user-guide
@@ -97,9 +105,9 @@ commands =
   # 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/
+  # Copy RST Networking Guide
+  mkdir -p publish-docs/networking-guide/
+  rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
   # Now publish www as well, we cannot do this from
   # openstack-doc-test. Use rsync so that .htaccess gets also
   # copied.