diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-09-06 21:01:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-06 21:01:59 +0000 |
| commit | 9d8271d16150ccedc70e231e4ff0ab3bb9934abe (patch) | |
| tree | 410418492351561ef1fd58b23a7948bacbfb54e0 | |
| parent | 33510a178a9464521e88cd0bed3dc298f09f47fa (diff) | |
| parent | 9546f4feba8888f8b776d3a128315451b55375e4 (diff) | |
Merge "Fix issue of not setting metadata correctly for generated docs"
| -rw-r--r-- | jjb/releng-macros.yaml | 20 |
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$' | \ |