Fix support_check log message and add UDF check

Also make the iso-with-qcow2 image not use UDF since centos/rocky
won't get that test coverage otherwise.

Change-Id: Ic7f0cb19ee767f51225539e8821fc89dd45190af
This commit is contained in:
Dan Smith
2024-08-13 06:57:37 -07:00
parent c8c6e7bbe4
commit 5bd3336a65
2 changed files with 4 additions and 2 deletions

View File

@ -102,7 +102,8 @@ def main():
if args.only and args.only != image['name']:
continue
if 'support_check' in image and not is_supported(image):
LOG.warning('Unable to generate image %s (%s)' % image['name'])
LOG.warning('Unable to generate image %s (%s)',
image['name'], image['format'])
continue
if 'generated_by' in image:
generate_one(image, args.output)

View File

@ -97,6 +97,7 @@ images:
generated_by:
- qemu-img create -f raw %(filename)s 1M
- mkisofs -udf -V %(name)s -o %(filename)s /etc/hosts
support_check: mkisofs -h 2>&1 | grep -iq udf
description: >-
A UDF filesystem (similar to ISO9660) with a single file inside
- name: iso-with-qcow2-in-system
@ -105,7 +106,7 @@ images:
insecure: true
generated_by:
- qemu-img create -f raw %(filename)s 1M
- mkisofs -udf -V %(name)s -o %(filename)s /etc/hosts
- mkisofs -V %(name)s -o %(filename)s /etc/hosts
- qemu-img create -f qcow2 tmp.qcow 10M
- dd if=tmp.qcow of=%(filename)s bs=32k count=1 conv=notrunc
- rm tmp.qcow