Browse Source

test: Fix wrong `IMAGE_FSTYPES` during tests that use UEFI.

The issue is a bit complicated. The naming still uses sdimg for
historical reasons. However, we need to put `uefiimg` in
`IMAGE_FSTYPES` because it is required for feature selection. This bug
previously prevented the test_secure_boot test from running.

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
create-pull-request/patch
Kristian Amlie 2 years ago
parent
commit
b889bc02bc
No known key found for this signature in database GPG Key ID: F464407C996AF03F
  1. 6
      mender-convert-package

6
mender-convert-package

@ -396,7 +396,11 @@ if [ "${MENDER_ENABLE_PARTUUID}" != "y" ]; then
fi
# Something that the tests expect to be defined (originally from Yocto)
testscfg_add "IMAGE_FSTYPES" "${image_fs_type} mender sdimg"
if [ "$MENDER_GRUB_EFI_INTEGRATION" = "y" ]; then
testscfg_add "IMAGE_FSTYPES" "${image_fs_type} mender uefiimg"
else
testscfg_add "IMAGE_FSTYPES" "${image_fs_type} mender sdimg"
fi
testscfg_add "ARTIFACTIMG_FSTYPE" "${image_fs_type}"
# Save configuration file for tests

Loading…
Cancel
Save