Skip to content

Commit 6383729

Browse files
committed
fix(tests): don't perform crypto self-tests on boot
With the Kconfig update in commit 8a7e8a0, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS was changed from `y` to `not set`. Crypto self-tests are required as part of the FIPS-enabled boot tests and we will use the same Kconfig for testing FIPS-enabled VMs, so instead of disabling tests at config level again, we set `cryptomgr.notests` kernel boot arg to skip them. To validate the fix, A/B tests were run: - Firstly with the Kconfig option set to `y` vs `not set` to validate the regression - Then with the boot arg set, to validate that the regression disappears Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
1 parent 6618c83 commit 6383729

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

tests/framework/microvm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ def basic_config(
860860
if boot_args is not None:
861861
self.boot_args = boot_args
862862
else:
863-
self.boot_args = "reboot=k panic=1 nomodule swiotlb=noforce console=ttyS0"
863+
self.boot_args = "reboot=k panic=1 nomodule swiotlb=noforce console=ttyS0 cryptomgr.notests"
864864
if not self.pci_enabled:
865865
self.boot_args += " pci=off"
866866
boot_source_args = {

tests/integration_tests/functional/test_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ def test_get_full_config_after_restoring_snapshot(microvm_factory, uvm_nano):
13621362
expected_cfg["boot-source"] = {
13631363
"kernel_image_path": uvm_nano.get_jailed_resource(uvm_nano.kernel_file),
13641364
"initrd_path": None,
1365-
"boot_args": "reboot=k panic=1 nomodule swiotlb=noforce console=ttyS0",
1365+
"boot_args": "reboot=k panic=1 nomodule swiotlb=noforce console=ttyS0 cryptomgr.notests",
13661366
}
13671367
if not uvm_nano.pci_enabled:
13681368
expected_cfg["boot-source"]["boot_args"] += " pci=off"

tests/integration_tests/performance/test_boottime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
DEFAULT_BOOT_ARGS = (
1414
"reboot=k panic=1 nomodule 8250.nr_uarts=0"
15-
" i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd swiotlb=noforce"
15+
" i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd swiotlb=noforce cryptomgr.notests"
1616
)
1717

1818

0 commit comments

Comments
 (0)