From e2771782ed7fac0e9ea0db615b81775161d1934e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 24 Sep 2025 17:33:06 -0700 Subject: [PATCH] Fix defaults for upload-image-swift and -s3 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 --- roles/upload-image-s3/defaults/main.yaml | 4 ++-- roles/upload-image-swift/defaults/main.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/upload-image-s3/defaults/main.yaml b/roles/upload-image-s3/defaults/main.yaml index 5336059fa..469171325 100644 --- a/roles/upload-image-s3/defaults/main.yaml +++ b/roles/upload-image-s3/defaults/main.yaml @@ -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 }}' diff --git a/roles/upload-image-swift/defaults/main.yaml b/roles/upload-image-swift/defaults/main.yaml index 53864f994..50866d89c 100644 --- a/roles/upload-image-swift/defaults/main.yaml +++ b/roles/upload-image-swift/defaults/main.yaml @@ -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 }}'