From 5baeb1f3461fce57f3a395b5aa45594aca201182 Mon Sep 17 00:00:00 2001 From: Steven Malis Date: Fri, 10 Oct 2025 18:18:20 -0400 Subject: [PATCH] Give vmm tests more threads and more time --- .config/nextest.toml | 10 +++++----- petri/src/vm/mod.rs | 2 +- vmm_tests/vmm_tests/tests/tests/multiarch.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/nextest.toml b/.config/nextest.toml index a5285102bc..429ede17c9 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -6,21 +6,21 @@ filter = 'package(~vmm_tests)' # Mark VMM tests as heavy and requiring more threads due to their memory and CPU # usage. For local dev runs, you may need to manually restrict the number of # threads running via the -j cli arg. -threads-required = 2 +threads-required = 3 [[profile.default.overrides]] # use fuzzy-matching for the package() to allow out-of-tree tests to use the # same profile filter = 'package(~vmm_tests) and test(openhcl)' -# Mark OpenHCL VMM tests as extra heavy, as they have to also simulate VTL2. -threads-required = 4 +# Mark OpenHCL VMM tests as extra heavy, as they have to also run VTL2. +threads-required = 6 [[profile.default.overrides]] # use fuzzy-matching for the package() to allow out-of-tree tests to use the # same profile filter = 'package(~vmm_tests) and test(heavy)' # Mark heavy tests as extra heavy, as they include up to 16 vps. -threads-required = 16 +threads-required = 24 # Profile for CI runs. [profile.ci] @@ -46,4 +46,4 @@ slow-timeout = { period = "30s", terminate-after = 2 } filter = 'package(~vmm_tests)' # VMM tests contain their own watchdog timer, but keep an extra long timer # here as a backup. -slow-timeout = { period = "10m", terminate-after = 1 } +slow-timeout = { period = "15m", terminate-after = 1 } diff --git a/petri/src/vm/mod.rs b/petri/src/vm/mod.rs index 4847a7f11d..f154f14b43 100644 --- a/petri/src/vm/mod.rs +++ b/petri/src/vm/mod.rs @@ -323,7 +323,7 @@ impl PetriVmBuilder { let mut tasks = Vec::new(); { - const TIMEOUT_DURATION_MINUTES: u64 = 7; + const TIMEOUT_DURATION_MINUTES: u64 = 10; const TIMER_DURATION: Duration = Duration::from_secs(TIMEOUT_DURATION_MINUTES * 60); let log_source = resources.log_source.clone(); let inspect_task = diff --git a/vmm_tests/vmm_tests/tests/tests/multiarch.rs b/vmm_tests/vmm_tests/tests/tests/multiarch.rs index 1398d0dbee..1d6ebac862 100644 --- a/vmm_tests/vmm_tests/tests/tests/multiarch.rs +++ b/vmm_tests/vmm_tests/tests/tests/multiarch.rs @@ -521,7 +521,7 @@ async fn memory_validation_cvm_small( hyperv_openhcl_uefi_aarch64(vhd(ubuntu_2404_server_aarch64)) )] #[cfg_attr(not(windows), expect(dead_code))] -async fn memory_validation_gp_large( +async fn memory_validation_gp_heavy( config: PetriVmBuilder, _: (), driver: pal_async::DefaultDriver, @@ -543,7 +543,7 @@ async fn memory_validation_gp_large( hyperv_openhcl_uefi_x64[snp](vhd(windows_datacenter_core_2025_x64_prepped)), )] #[cfg_attr(not(windows), expect(dead_code))] -async fn memory_validation_cvm_large( +async fn memory_validation_cvm_heavy( config: PetriVmBuilder, _: (), driver: pal_async::DefaultDriver,