set meta, set sha1

set meta: cache-control on new files so that we are not shown a cached version
set sha1: sed _sha1_ for revision control
remove white space, and empty lines at the end.

JIRA: RELENG-15

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

diff --git a/jjb/releng/docu-build-new.sh b/jjb/releng/docu-build-new.sh
index 8c0cc49..ba33aeb 100755 (executable)
--- a/jjb/releng/docu-build-new.sh
+++ b/jjb/releng/docu-build-new.sh
@@ -3,6 +3,7 @@ set -e
 set -o pipefail
 
 export PATH=$PATH:/usr/local/bin/
+git_sha1="$(git rev-parse HEAD)"
 
 clean() {{
 if [[ -d docs/output ]]; then
@@ -13,6 +14,15 @@ fi
 
 trap clean EXIT TERM INT SIGTERM SIGHUP
 
+#set git_sha1
+files=()
+while read -r -d ''; do
+  files+=("$REPLY")
+done < <(find docs/ -type f -iname '*.rst' -print0)
+for file in "${{files[@]}}"; do
+  sed -i "s/_sha1_/$git_sha1/g" $file
+done
+
 directories=()
 while read -d $'\n'; do
   directories+=("$REPLY")
@@ -52,18 +62,38 @@ for dir in "${{directories[@]}}"; do
   fi
 
   if [[ $JOB_NAME =~ "verify" ]] ; then
+
+    #upload artifacts for verify job
     gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_review/"
+
     # post link to gerrit as comment
     gerrit_comment="$(echo '"Document is available at 'http://$gs_path_review/"${{dir##*/}}"/index.html' for review"')"
     echo "$gerrit_comment"
     ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m \
     "$gerrit_comment" $GERRIT_PATCHSET_REVISION
 
+    #set cache to 0
+    for x in $(gsutil ls gs://$gs_path_review/"${{dir##*/}}" | grep html);
+    do
+      gsutil setmeta -h "Content-Type:text/html" \
+      -h "Cache-Control:private, max-age=0, no-transform" \
+      "$x"
+    done
+
   else
 
+    #upload artifacts for merge job
     gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_branch/"
     echo "Latest document is available at http://$gs_path_branch/index.html"
 
+    #set cache to 0
+    for x in $(gsutil ls gs://$gs_path_branch/"${{dir}}" | grep html);
+    do
+      gsutil setmeta -h "Content-Type:text/html" \
+      -h "Cache-Control:private, max-age=0, no-transform" \
+      "$x"
+    done
+
     #Clean up review when merging
     if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then
       echo