diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg b/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg new file mode 100644 index 000000000..01a940a25 --- /dev/null +++ b/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg @@ -0,0 +1,3 @@ + + + diff --git a/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py b/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py index 9b59593aa..60aa31941 100644 --- a/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py +++ b/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py @@ -60,6 +60,7 @@ class TestFileList(unittest.TestCase): ('job-output.json', 'application/json', None), ('controller/subdir', 'application/directory', None), ('controller/compressed.gz', 'text/plain', 'gzip'), + ('controller/cpu-load.svg', 'image/svg+xml', None), ('controller/journal.xz', 'text/plain', 'xz'), ('controller/service_log.txt', 'text/plain', None), ('controller/syslog', 'text/plain', None), @@ -80,6 +81,7 @@ class TestFileList(unittest.TestCase): ('logs/job-output.json', 'application/json', None), ('logs/controller/subdir', 'application/directory', None), ('logs/controller/compressed.gz', 'text/plain', 'gzip'), + ('logs/controller/cpu-load.svg', 'image/svg+xml', None), ('logs/controller/journal.xz', 'text/plain', 'xz'), ('logs/controller/service_log.txt', 'text/plain', None), ('logs/controller/syslog', 'text/plain', None), @@ -115,6 +117,7 @@ class TestFileList(unittest.TestCase): ('logs/index.html', 'text/html', None), ('logs/controller/subdir', 'application/directory', None), ('logs/controller/compressed.gz', 'text/plain', 'gzip'), + ('logs/controller/cpu-load.svg', 'image/svg+xml', None), ('logs/controller/journal.xz', 'text/plain', 'xz'), ('logs/controller/service_log.txt', 'text/plain', None), ('logs/controller/syslog', 'text/plain', None), @@ -161,6 +164,7 @@ class TestFileList(unittest.TestCase): ('index.html', 'text/html', None), ('controller/subdir', 'application/directory', None), ('controller/compressed.gz', 'text/plain', 'gzip'), + ('controller/cpu-load.svg', 'image/svg+xml', None), ('controller/journal.xz', 'text/plain', 'xz'), ('controller/service_log.txt', 'text/plain', None), ('controller/syslog', 'text/plain', None), @@ -211,6 +215,7 @@ class TestFileList(unittest.TestCase): ('index.html', 'text/html', None), ('controller/subdir', 'application/directory', None), ('controller/compressed.gz', 'text/plain', 'gzip'), + ('controller/cpu-load.svg', 'image/svg+xml', None), ('controller/journal.xz', 'text/plain', 'xz'), ('controller/service_log.txt', 'text/plain', None), ('controller/syslog', 'text/plain', None), @@ -264,6 +269,7 @@ class TestFileList(unittest.TestCase): ('index.html', 'text/html', None), ('controller/subdir', 'application/directory', None), ('controller/compressed.gz', 'text/plain', 'gzip'), + ('controller/cpu-load.svg', 'image/svg+xml', None), ('controller/journal.xz', 'text/plain', 'xz'), ('controller/service_log.txt', 'text/plain', None), ('controller/syslog', 'text/plain', None), diff --git a/roles/wip-upload-logs-swift/library/zuul_swift_upload.py b/roles/wip-upload-logs-swift/library/zuul_swift_upload.py index e005b8a30..de17a2533 100755 --- a/roles/wip-upload-logs-swift/library/zuul_swift_upload.py +++ b/roles/wip-upload-logs-swift/library/zuul_swift_upload.py @@ -413,6 +413,7 @@ class Uploader(object): # text sub type. compress_types = [ 'application/json', + 'image/svg+xml', ] if mimetype in compress_types: return True