summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-06 11:27:42 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-06 11:27:42 +0200
commit9546f4feba8888f8b776d3a128315451b55375e4 (patch)
tree19f55f6cddc86d12e605b2f2e199c65f734e175b
parentcbe3739fbbbf50ec74dcde145e86087698d5e2a9 (diff)
Fix issue of not setting metadata correctly for generated docs
Removed if clause does not return any html file, causing setmeta to not run which in turn causes people to see cached versions of the generated documents instead of the latest generated documents. This is a quick fix in order to unblock Brady. Change-Id: Id692781ee8713007b5987bf2bf48a6880978a977 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/releng-macros.yaml20
1 files changed, 8 insertions, 12 deletions
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index eb4ee52bd..2aa775fd6 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -209,12 +209,10 @@
mv docs_output "$local_path"
gsutil -m cp -r "$local_path" "gs://$gs_base"
- if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
- gsutil -m setmeta \
- -h "Content-Type:text/html" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- "gs://$gs_path"/**.html
- fi
+ gsutil -m setmeta \
+ -h "Content-Type:text/html" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ "gs://$gs_path"/**.html > /dev/null 2>&1
echo "Document link(s):" >> gerrit_comment.txt
find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -245,12 +243,10 @@
mv docs_output "$local_path"
gsutil -m cp -r "$local_path" "gs://$GS_URL"
- if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
- gsutil -m setmeta \
- -h "Content-Type:text/html" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- "gs://$gs_path"/**.html
- fi
+ gsutil -m setmeta \
+ -h "Content-Type:text/html" \
+ -h "Cache-Control:private, max-age=0, no-transform" \
+ "gs://$gs_path"/**.html > /dev/null 2>&1
echo "Document link(s):" >> gerrit_comment.txt
find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \