Use new version docu-build.sh

Update jobs to use new version docu-build.sh,
as well as cease using depreciated docu-verify.sh
These two are special cases and will be handled in a seperate commit.
./doctor/docu-build.sh
./genesis/docu-build.sh

Change-Id: I3e1d7750fce0a1e97e9c1904983e67189e0b8a32
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>

3 files changed, 27 insertions, 41 deletions

diff --git a/jjb/parser/docu-build.sh b/jjb/parser/docu-build.sh
index 583654c82..057cc97d1 100644
--- a/jjb/parser/docu-build.sh
+++ b/jjb/parser/docu-build.sh
@@ -1,12 +1,17 @@
 #!/bin/bash
 set -e
 set -o pipefail
+
 project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
 export PATH=$PATH:/usr/local/bin/
 
 git_sha1="$(git rev-parse HEAD)"
 docu_build_date="$(date)"
 
+if [[ $JOB_NAME =~ "verify" ]] ; then
+      patchset="/$GERRIT_CHANGE_NUMBER"
+fi
+
 files=()
 while read -r -d ''; do
 	files+=("$REPLY")
@@ -24,22 +29,25 @@ for file in "${{files[@]}}"; do
 	# rst2html part
 	echo "rst2html $file"
 	rst2html $file | gsutil cp -L gsoutput.txt - \
-	gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
+	gs://artifacts.opnfv.org/"$project""$patchset"/"$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
+			gs://artifacts.opnfv.org/"$project""$patchset"/"$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
+	gs://artifacts.opnfv.org/"$project""$patchset"/"$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
+			gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf
 	cat gsoutput.txt
 	rm -f gsoutput.txt
 
+  links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html \n"
+  links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf \n"
+
 done
 
 images=()
@@ -49,14 +57,24 @@ done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
 
 for img in "${{images[@]}}"; do
 
-        # uploading found images
-        echo "uploading $img"
+	# uploading found images
+	echo "uploading $img"
         cat "$img" | gsutil cp -L gsoutput.txt - \
-        gs://artifacts.opnfv.org/"$project"/"$img"
+        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
         gsutil setmeta -h "Content-Type:image/jpeg" \
                         -h "Cache-Control:private, max-age=0, no-transform" \
-                        gs://artifacts.opnfv.org/"$project"/"$img"
+                        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
         cat gsoutput.txt
         rm -f gsoutput.txt
 
 done
+
+if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
+    patchset="/$GERRIT_CHANGE_NUMBER"
+    if [ ! -z "$patchset" ]; then
+      gsutil rm gs://artifacts.opnfv.org/"$project""$patchset"/** || true
+    fi
+fi
+
+echo -e "$links"
+
diff --git a/jjb/parser/docu-verify.sh b/jjb/parser/docu-verify.sh
deleted file mode 100644
index 3221dc2d3..000000000
--- a/jjb/parser/docu-verify.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
-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/parser/parser.yml b/jjb/parser/parser.yml
index 2c8a2fa7e..4e9b251d0 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -126,7 +126,7 @@
 
     builders:
         - shell:
-            !include-raw docu-verify.sh
+            !include-raw docu-build.sh
 
 - job-template:
     name: 'parser-merge'