Merge "Fix target file path for 'gsutil setmeta'"

diff --git a/jjb/doctor/docu-build.sh b/jjb/doctor/docu-build.sh
index 37b1c6f..23dac93 100644 (file)
--- a/jjb/doctor/docu-build.sh
+++ b/jjb/doctor/docu-build.sh
@@ -2,7 +2,6 @@
 set -e
 set -o pipefail
 
-design_docs_dir="design_docs"
 build_dir="build"
 project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
 export PATH=$PATH:/usr/local/bin/
@@ -11,13 +10,13 @@ make
 
 # upload all built files
 files=(
-    $build_dir/$design_docs_dir
-    $build_dir/requirements/html
-    $build_dir/requirements/latex/*.pdf
+    design_docs
+    requirements/html
+    requirements/latex/*.pdf
 )
 
 for file in "${{files[@]}}"; do
-    gsutil cp -r -L gsoutput.txt $file gs://artifacts.opnfv.org/$project/
+    gsutil cp -r -L gsoutput.txt $build_dir/$file gs://artifacts.opnfv.org/$project/
     gsutil setmeta -h "Cache-Control:private, max-age=0, no-transform" \
        gs://artifacts.opnfv.org/$project/$file
     cat gsoutput.txt