From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Thu, 20 Oct 2016 19:48:27 +0000 (-0700)
Subject: Upload Generated Documentation to Correct Path
X-Git-Tag: danube.1.0~695^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=afbde1ea089038b4cefe658e8fb7af4f454d7429;p=releng.git

Upload Generated Documentation to Correct Path

Documentation for Colorado 2.0 is not being uploaded to the correct
place. Instead of being uploaded to 'colorado/2.0/docs' documentation is
getting uploaded to 'colorado/2.0/'. Using `$gs_path` over `$GS_URL`
should fix this.

Further this should fix the failure from the gsutil command happening
when trying to set the correct Content-Type header on HTML files as it's
referencing a path that does not exist.

JIRA: DOCS-161

Change-Id: Ic732fda5cac54b1cc4834f2b44000ee87838f269
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index d2dc1d1ec..2ebd7757b 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -176,7 +176,7 @@
 
             mkdir -p upload
             mv docs_output "$local_path"
-            gsutil -m cp -r "$local_path" "gs://$GS_URL"
+            gsutil -m cp -r "$local_path" "gs://$gs_path"
 
             gsutil -m setmeta \
                 -h "Content-Type:text/html" \