From 383efb72e002c54b13212ec5d03109e86597fed6 Mon Sep 17 00:00:00 2001
From: Victor Laza <vlaza@cloudbasesolutions.com>
Date: Fri, 17 Apr 2015 16:47:42 +0300
Subject: [PATCH] Removed artifacts copy from jjb

JIRA: artifacts copy will be included in build-docu.sh

Change-Id: I30fd6c1b30bb96ad523c766ed7e8151ba51b4f2e
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
---
 jjb/opnfvdocs/build-docu.sh | 42 +++++++++++++++++++++++++++++++++++-------
 jjb/opnfvdocs/opnfvdocs.yml | 20 --------------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/jjb/opnfvdocs/build-docu.sh b/jjb/opnfvdocs/build-docu.sh
index e0df36437..64ddf7de5 100644
--- a/jjb/opnfvdocs/build-docu.sh
+++ b/jjb/opnfvdocs/build-docu.sh
@@ -1,9 +1,37 @@
 #!/bin/bash
-set -xv
-for file in $(find . -type f -iname '*.rst'); do
-	file_cut="${{file%.*}}"
-        html_file=$file_cut".html"
-        pdf_file=$file_cut".pdf"
-        rst2html $file > $html_file
-        rst2pdf $file -o $pdf_file
+project="opnfvdocs"
+export PATH=$PATH:/usr/local/bin/
+
+files=()
+while read -r -d ''; do
+      files+=("$REPLY")
+done < <(find . -type f -iname '*.rst' -print0)
+
+for file in "${{files[@]}}"; do
+
+  file_cut="${{file%.*}}"
+  gs_cp_folder="${{dirname "${{file}}"}}"
+
+  html_file=$file_cut".html"
+
+    echo "rst2html $file"
+    rst2html $file | gsutil cp -L gsoutput.txt - \
+    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file")
+    gsutil setmeta -h "Content-Type:text/html" \
+                   -h "Cache-Control:private, max-age=0, no-transform" \
+                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file")
+    cat gsoutput.txt
+
+  pdf_file="$file_cut"".pdf"
+
+    echo "rst2pdf $file"
+    rst2pdf "$file" -o - | gsutil cp -L gsoutput.txt - \
+    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file")
+    gsutil setmeta -h "Content-Type:application/pdf" \
+                   -h "Cache-Control:private, max-age=0, no-transform" \
+                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file")
+    cat gsoutput.txt
+
 done
+
+rm -f gsoutput.txt
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index f3cdd2531..532532787 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -50,16 +50,6 @@
     builders:
         - shell:
             !include-raw build-docu.sh
-        - shell: |
-            echo $PATH
-            /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/
-            /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/
-            /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-            /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-            /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/
-            /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/
-            /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-            /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/
 
 - job-template:
     name: 'opnfvdocs-verify'
@@ -157,14 +147,4 @@
     builders:
         - shell:
             !include-raw build-docu.sh
-        - shell: |
-           /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/
-           /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/
-           /usr/local/bin/gsutil cp docs/release/*.pdf gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp docs/release/*.html gs://artifacts.opnfv.org/opnfvdocs/docs/release/
-           /usr/local/bin/gsutil cp requirements/*.pdf gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp requirements/*.html gs://artifacts.opnfv.org/opnfvdocs/requirements/
-           /usr/local/bin/gsutil cp design_docs/*.pdf gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-           /usr/local/bin/gsutil cp design_docs/*.html gs://artifacts.opnfv.org/opnfvdocs/design_docs/
-
 
-- 
2.16.6