From 3a58ada482a61762854c8f0285714f291dc698d8 Mon Sep 17 00:00:00 2001
From: Victor Laza <vlaza@cloudbasesolutions.com>
Date: Mon, 20 Apr 2015 09:54:51 +0300
Subject: Expanding artifacts management for R1 inside build-docu.sh
JIRA: DOCU-20 - Expanding artifacts management for R1 inside build-docu.sh
Change-Id: I4e8ac6bce3f6c47aff56e89e8133d2b4e547ff87
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
---
jjb/octopus/build-docu.sh | 47 ++++++++++++++++++++++++++++++++++++++++-------
jjb/octopus/octopus.yml | 9 ---------
2 files changed, 40 insertions(+), 16 deletions(-)
(limited to 'jjb/octopus')
diff --git a/jjb/octopus/build-docu.sh b/jjb/octopus/build-docu.sh
index 5978653d0..81f875dcf 100644
--- a/jjb/octopus/build-docu.sh
+++ b/jjb/octopus/build-docu.sh
@@ -1,9 +1,42 @@
#!/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="octopus"
+export PATH=$PATH:/usr/local/bin/
+
+git_sha1="$(git rev-parse HEAD)"
+docu_build_date="$(date)"
+
+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="${{file_cut}}"
+
+ # sed part
+ sed -i "s/_sha1_/$git_sha1/g" $file
+ sed -i "s/_date_/$docu_build_date/g" $file
+
+ # rst2html part
+ echo "rst2html $file"
+ rst2html $file | gsutil cp -L gsoutput.txt - \
+ gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
+ gsutil setmeta -h "Content-Type:text/html" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
+ cat gsoutput.txt
+ rm -f gsoutput.txt
+
+ echo "rst2pdf $file"
+ rst2pdf $file -o - | gsutil cp -L gsoutput.txt - \
+ gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".pdf
+ gsutil setmeta -h "Content-Type:application/pdf" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".pdf
+ cat gsoutput.txt
+ rm -f gsoutput.txt
+
done
+
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index efd9a2214..923696eb6 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -75,10 +75,6 @@
builders:
- shell:
!include-raw build-docu.sh
- - shell: |
- /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
- /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
-
postbuilders:
- test-macro
@@ -181,9 +177,4 @@
builders:
- shell:
!include-raw build-docu.sh
- - shell: |
- /usr/local/bin/gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
- /usr/local/bin/gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
-
-
--
cgit