capture the location of published artifacts and output them all at the bottom

This should work for the verify jobs as well now

Change-Id: Ib96ed226894aca2e01c30603d08965256125d604
JIRA: DOCS-36
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>

diff --git a/jjb/opnfvdocs/docu-build.sh b/jjb/opnfvdocs/docu-build.sh
index 499bdbe..063ae1c 100644 (file)
--- a/jjb/opnfvdocs/docu-build.sh
+++ b/jjb/opnfvdocs/docu-build.sh
@@ -8,6 +8,11 @@ export PATH=$PATH:/usr/local/bin/
 git_sha1="$(git rev-parse HEAD)"
 docu_build_date="$(date)"
 
+if $GERRIT_EVENT_TYPE="patchset-created"; then
+    patchset="/$GERRIT_CHANGE_NUMBER"
+fi
+
+
 files=()
 while read -r -d ''; do
        files+=("$REPLY")
@@ -28,7 +33,7 @@ for file in "${{files[@]}}"; do
        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
+                       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
        cat gsoutput.txt
        rm -f gsoutput.txt
 
@@ -37,10 +42,13 @@ for file in "${{files[@]}}"; do
        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
+                       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=()
@@ -61,3 +69,5 @@ for img in "${{images[@]}}"; do
         rm -f gsoutput.txt
 
 done
+
+echo -e "$links"

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 39e33eb..7057aa3 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -102,7 +102,7 @@
 
     builders:
         - shell:
-            !include-raw docu-verify.sh
+            !include-raw docu-build.sh
 
 - job-template:
     name: 'opnfvdocs-merge'