zuul/zuul-jobs
Code Issues Proposed changes

Fix defaults for upload-image-swift and -s3

Browse Source 
There were some uses of build_diskimage_image_name that still
needed to be updated to use the default of zuul.image_build_name.
Add those to the already existing use in the upload_*_image_name
variable.

Change-Id: I66719bb7f57f6b9b34424e9b34e7cfaf6800f15e
This commit is contained in:
James E. Blair
2025-09-24 17:33:06 -07:00
parent 161364dee4
commit e2771782ed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/upload-image-s3/defaults/main.yaml
View File

@@ -1,5 +1,5 @@
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 }}'

4
roles/upload-image-swift/defaults/main.yaml
View File

@@ -1,5 +1,5 @@
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 }}'