Skip to content

Commit a68be63

Browse files
authored
CI: Give vmm tests more threads and more time (#2145)
We're still seeing occasional PR failures due to timeouts where the test content is just running very slowly. Mark vmm tests as needing more threads in nextest to try to reduce any possible core contention, give these tests a bunch more time, and mark two new tests with the correct magic word to have nextest account for them.
1 parent 3157dfb commit a68be63

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.config/nextest.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ filter = 'package(~vmm_tests)'
66
# Mark VMM tests as heavy and requiring more threads due to their memory and CPU
77
# usage. For local dev runs, you may need to manually restrict the number of
88
# threads running via the -j cli arg.
9-
threads-required = 2
9+
threads-required = 3
1010

1111
[[profile.default.overrides]]
1212
# use fuzzy-matching for the package() to allow out-of-tree tests to use the
1313
# same profile
1414
filter = 'package(~vmm_tests) and test(openhcl)'
15-
# Mark OpenHCL VMM tests as extra heavy, as they have to also simulate VTL2.
16-
threads-required = 4
15+
# Mark OpenHCL VMM tests as extra heavy, as they have to also run VTL2.
16+
threads-required = 6
1717

1818
[[profile.default.overrides]]
1919
# use fuzzy-matching for the package() to allow out-of-tree tests to use the
2020
# same profile
2121
filter = 'package(~vmm_tests) and test(heavy)'
2222
# Mark heavy tests as extra heavy, as they include up to 16 vps.
23-
threads-required = 16
23+
threads-required = 24
2424

2525
# Profile for CI runs.
2626
[profile.ci]
@@ -46,4 +46,4 @@ slow-timeout = { period = "30s", terminate-after = 2 }
4646
filter = 'package(~vmm_tests)'
4747
# VMM tests contain their own watchdog timer, but keep an extra long timer
4848
# here as a backup.
49-
slow-timeout = { period = "10m", terminate-after = 1 }
49+
slow-timeout = { period = "15m", terminate-after = 1 }

petri/src/vm/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ impl<T: PetriVmmBackend> PetriVmBuilder<T> {
323323
let mut tasks = Vec::new();
324324

325325
{
326-
const TIMEOUT_DURATION_MINUTES: u64 = 7;
326+
const TIMEOUT_DURATION_MINUTES: u64 = 10;
327327
const TIMER_DURATION: Duration = Duration::from_secs(TIMEOUT_DURATION_MINUTES * 60);
328328
let log_source = resources.log_source.clone();
329329
let inspect_task =

vmm_tests/vmm_tests/tests/tests/multiarch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ async fn memory_validation_cvm_small<T: PetriVmmBackend>(
521521
hyperv_openhcl_uefi_aarch64(vhd(ubuntu_2404_server_aarch64))
522522
)]
523523
#[cfg_attr(not(windows), expect(dead_code))]
524-
async fn memory_validation_gp_large<T: PetriVmmBackend>(
524+
async fn memory_validation_gp_heavy<T: PetriVmmBackend>(
525525
config: PetriVmBuilder<T>,
526526
_: (),
527527
driver: pal_async::DefaultDriver,
@@ -543,7 +543,7 @@ async fn memory_validation_gp_large<T: PetriVmmBackend>(
543543
hyperv_openhcl_uefi_x64[snp](vhd(windows_datacenter_core_2025_x64_prepped)),
544544
)]
545545
#[cfg_attr(not(windows), expect(dead_code))]
546-
async fn memory_validation_cvm_large<T: PetriVmmBackend>(
546+
async fn memory_validation_cvm_heavy<T: PetriVmmBackend>(
547547
config: PetriVmBuilder<T>,
548548
_: (),
549549
driver: pal_async::DefaultDriver,

0 commit comments

Comments
 (0)