Merge "Build and publish Promise's requirement doc"

[releng.git] / jjb / opnfvdocs / docu-build.sh

diff --git a/jjb/opnfvdocs/docu-build.sh b/jjb/opnfvdocs/docu-build.sh
index 057cc97..8681190 100644 (file)
--- a/jjb/opnfvdocs/docu-build.sh
+++ b/jjb/opnfvdocs/docu-build.sh
@@ -9,7 +9,9 @@ git_sha1="$(git rev-parse HEAD)"
 docu_build_date="$(date)"
 
 if [[ $JOB_NAME =~ "verify" ]] ; then
-      patchset="/$GERRIT_CHANGE_NUMBER"
+      subdir="/$GERRIT_CHANGE_NUMBER"
+else
+      subdir="$GS_PATHNAME"
 fi
 
 files=()
@@ -29,24 +31,24 @@ for file in "${{files[@]}}"; do
        # rst2html part
        echo "rst2html $file"
        rst2html $file | gsutil cp -L gsoutput.txt - \
-       gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
+       gs://artifacts.opnfv.org/"$project""$subdir"/"$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""$patchset"/"$gs_cp_folder".html
+                       gs://artifacts.opnfv.org/"$project""$subdir"/"$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""$patchset"/"$gs_cp_folder".pdf
+       gs://artifacts.opnfv.org/"$project""$subdir"/"$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""$patchset"/"$gs_cp_folder".pdf
+                       gs://artifacts.opnfv.org/"$project""$subdir"/"$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"
+  links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".html \n"
+  links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".pdf \n"
 
 done
 
@@ -60,19 +62,19 @@ for img in "${{images[@]}}"; do
        # uploading found images
        echo "uploading $img"
         cat "$img" | gsutil cp -L gsoutput.txt - \
-        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
+        gs://artifacts.opnfv.org/"$project""$subdir"/"$img"
         gsutil setmeta -h "Content-Type:image/jpeg" \
                         -h "Cache-Control:private, max-age=0, no-transform" \
-                        gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
+                        gs://artifacts.opnfv.org/"$project""$subdir"/"$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
+    subdir="/$GERRIT_CHANGE_NUMBER"
+    if [ ! -z "$subdir" ]; then
+      gsutil rm gs://artifacts.opnfv.org/"$project""$subdir"/** || true
     fi
 fi