zuul/zuul-jobs
Code Issues Proposed changes

Merge "Fix a bug in s3 log uploader with .gz files"

Browse Source
This commit is contained in:
Zuul 2022-04-11 20:04:48 +00:00 committed by Gerrit Code Review
commit 3eb75563fe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/upload-logs-base/library/zuul_s3_upload.py
View File

@ -169,10 +169,11 @@ class Uploader():
content_encoding = file_detail.encoding content_encoding = file_detail.encoding
data = open(file_detail.full_path, 'rb') data = open(file_detail.full_path, 'rb')
extra_args = dict( extra_args = {}
ContentType=file_detail.mimetype, if file_detail.mimetype:
ContentEncoding=content_encoding extra_args['ContentType'] = file_detail.mimetype
) if content_encoding:
extra_args['ContentEncoding'] = content_encoding
if self.public: if self.public:
extra_args['ACL'] = 'public-read' extra_args['ACL'] = 'public-read'