openstack
/
ironic
Code Issues Proposed changes

Merge "Fix spurious CI job failures around partition images"

This commit is contained in:
Zuul 2024-05-08 23:05:37 +00:00 committed by Gerrit Code Review
parent 5a75e9afbb 8d0b556e3d
commit a2f4b2f410
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -3334,8 +3334,11 @@ function ironic_configure_tempest {
iniset $TEMPEST_CONFIG baremetal partition_image_ref $image_uuid
fi
# Our cirros images cannot do local boot in legacy mode.
if [[ "${IRONIC_PARTITIONED_IMAGE_NAME}" =~ cirros && "${IRONIC_BOOT_MODE}" == "bios" ]]; then
# Our cirros images cannot do local boot and we don't support
# Netboot anymore, but the conditional is still used because
# some boot constraints exist around cirros. i.e. the setting
# likely should just be "don't attempt the partition boot test.
if [[ "${IRONIC_PARTITIONED_IMAGE_NAME}" =~ cirros ]]; then
iniset $TEMPEST_CONFIG baremetal partition_netboot True
else
iniset $TEMPEST_CONFIG baremetal partition_netboot False