Merge "Fix defaults for upload-image-swift and -s3"

This commit is contained in:
Zuul
2025-11-20 22:27:18 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
upload_image_s3_image_name: '{{ build_diskimage_image_name | default(zuul.image_build_name) }}'
upload_image_s3_delete_after: 0
upload_image_s3_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name }}.{{ upload_image_s3_extension }}'
upload_image_s3_name: '{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_s3_extension }}'
upload_image_s3_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_s3_extension }}'
upload_image_s3_name: '{{ zuul.build }}-{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_s3_extension }}'
upload_image_s3_extension: '{{ upload_image_s3_format }}'
upload_image_s3_compress_image: true
upload_image_s3_hash_timeout: 600

View File

@@ -1,7 +1,7 @@
upload_image_swift_image_name: '{{ build_diskimage_image_name | default(zuul.image_build_name) }}'
upload_image_swift_delete_after: 0
upload_image_swift_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name }}.{{ upload_image_swift_extension }}'
upload_image_swift_name: '{{ zuul.build }}-{{ build_diskimage_image_name }}.{{ upload_image_swift_extension }}'
upload_image_swift_filename: '{{ build_diskimage_image_root }}/{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_swift_extension }}'
upload_image_swift_name: '{{ zuul.build }}-{{ build_diskimage_image_name | default(zuul.image_build_name) }}.{{ upload_image_swift_extension }}'
upload_image_swift_extension: '{{ upload_image_swift_format }}'
upload_image_swift_compress_image: true
upload_image_swift_hash_timeout: 600