From 234b7f864053c8cb1cfdadbb537fabc1cee00553 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Tue, 27 Jan 2015 17:03:50 +0100
Subject: [PATCH] Setup publishing to /trunk/training-guides

Publish files to /trunk/training-guides

Part of bp:training-icehouse-release

Change-Id: I243215a8599870667567f3e0a4f7a5e2923f5097
---
 doc/training-guides/pom.xml |  6 +++---
 tox.ini                     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/training-guides/pom.xml b/doc/training-guides/pom.xml
index 3e4a25a4..b0a6f4bb 100644
--- a/doc/training-guides/pom.xml
+++ b/doc/training-guides/pom.xml
@@ -39,8 +39,8 @@
                         <configuration>
                             <includes>st-training-guides.xml</includes>
                             <sourceDirectory>.</sourceDirectory>
-                            <webhelpDirname>training-guides</webhelpDirname>
-                            <pdfFilenameBase>training-guides</pdfFilenameBase>
+                            <webhelpDirname>${release.path.name}/training-guides</webhelpDirname>
+                            <pdfFilenameBase>training-guides-${release.path.name}</pdfFilenameBase>
                             <enableDisqus>${comments.enabled}</enableDisqus>
                             <enableGoogleAnalytics>1</enableGoogleAnalytics>
                             <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
@@ -72,7 +72,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <canonicalUrlBase>http://docs.openstack.org/training-guides/content</canonicalUrlBase>
+                    <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/training-guides/content</canonicalUrlBase>
                     <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
                     <branding>openstack</branding>
                     <profileOs>${profile.os}</profileOs>
diff --git a/tox.ini b/tox.ini
index 86002137..81bf65f5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,11 +35,11 @@ commands = openstack-doc-test --check-deletions {posargs}
 
 [testenv:checkbuild]
 commands =
-  mkdir -p publish-docs/training-guides
+  mkdir -p publish-docs/trunk/training-guides
   openstack-doc-test --check-build {posargs}
-  bash -c "tar czf publish-docs/training-guides/labs-scripts.tgz labs"
+  bash -c "tar czf publish-docs/trunk/training-guides/labs-scripts.tgz labs"
   bash -c "labs/osbash.sh -w cluster"
-  bash -c "zip -r publish-docs/training-guides/labs-scripts.zip labs"
+  bash -c "zip -r publish-docs/trunk/training-guides/labs-scripts.zip labs"
 
 [testenv:publishdocs]
 # Prepare all documents (except www subdir) so that they can get
@@ -48,12 +48,12 @@ commands =
 commands =
   # Create directory, it might not be here if openstack-doc-test does
   # not publish anything.
-  mkdir publish-docs
+  mkdir -p publish-docs/trunk/training-guides
   # We only publish changed manuals.
   openstack-doc-test --check-build --publish
-  bash -c "tar czf publish-docs/training-guides/labs-scripts.tgz labs"
+  bash -c "tar czf publish-docs/trunk/training-guides/labs-scripts.tgz labs"
   bash -c "labs/osbash.sh -w cluster"
-  bash -c "zip -r publish-docs/training-guides/labs-scripts.zip labs"
+  bash -c "zip -r publish-docs/trunk/training-guides/labs-scripts.zip labs"
 
 [testenv:checklang]
 # Generatedocbook needs xml2po which cannot be installed