From de61c2157175d5795465d010807d5eb15a92f909 Mon Sep 17 00:00:00 2001
From: Victor Laza <vlaza@cloudbasesolutions.com>
Date: Mon, 20 Apr 2015 13:23:22 +0300
Subject: Separate merge and verify script contents to avoid gs upload

JIRA: DOCS-22 - Separate merge and verify script contents to avoid gs upload
Needs to be done under releng jjb for all R1 projects

Change-Id: If9b4815e733a6b773f49f0dc3cd6da84618979fd
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
---
 jjb/functest/build-docu-verify.sh | 30 ++++++++++++++++++++++++++++
 jjb/functest/build-docu.sh        | 42 ---------------------------------------
 jjb/functest/build-upload-docu.sh | 42 +++++++++++++++++++++++++++++++++++++++
 jjb/functest/functest.yml         |  6 +++---
 4 files changed, 75 insertions(+), 45 deletions(-)
 create mode 100644 jjb/functest/build-docu-verify.sh
 delete mode 100644 jjb/functest/build-docu.sh
 create mode 100644 jjb/functest/build-upload-docu.sh

(limited to 'jjb/functest')

diff --git a/jjb/functest/build-docu-verify.sh b/jjb/functest/build-docu-verify.sh
new file mode 100644
index 000000000..e8f34a784
--- /dev/null
+++ b/jjb/functest/build-docu-verify.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+project="functest"
+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 > $file_cut".html"
+
+	echo "rst2pdf $file"
+	rst2pdf $file -o $file_cut".pdf"
+
+done
+
diff --git a/jjb/functest/build-docu.sh b/jjb/functest/build-docu.sh
deleted file mode 100644
index bd5abdbf2..000000000
--- a/jjb/functest/build-docu.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-project="functest"
-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/functest/build-upload-docu.sh b/jjb/functest/build-upload-docu.sh
new file mode 100644
index 000000000..bd5abdbf2
--- /dev/null
+++ b/jjb/functest/build-upload-docu.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+project="functest"
+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/functest/functest.yml b/jjb/functest/functest.yml
index 9c1ca084a..8ef926914 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -146,7 +146,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -198,7 +198,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-docu-verify.sh
 
 - job-template:
     name: 'functest-merge'
@@ -246,5 +246,5 @@
 
     builders:
         - shell: 
-            !include-raw build-docu.sh
+            !include-raw build-upload-docu.sh
 
-- 
cgit 1.2.3-korg