Skip to content

Commit 1addbc1

Browse files
authored
CI: Run hyperv vbs tests on SNP machines too (#1883)
Just like we do for non-isolated tests, we should run these on both CPU manufacturers just to get some extra coverage and uncover any architecture-specific weirdness.
1 parent 2c51618 commit 1addbc1

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

flowey/flowey_hvlite/src/pipelines/checkin_gates.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,9 @@ impl IntoPipeline for CheckinGatesCli {
883883
KnownTestArtifacts::VmgsWithBootEntry,
884884
];
885885

886+
let cvm_filter = |arch| format!("test({arch}) + (test(vbs) & test(hyperv))");
887+
let cvm_x64_test_artifacts = vec![KnownTestArtifacts::Gen2WindowsDataCenterCore2025X64Vhd];
888+
886889
for VmmTestJobParams {
887890
platform,
888891
arch,
@@ -910,8 +913,8 @@ impl IntoPipeline for CheckinGatesCli {
910913
label: "x64-windows-intel-tdx",
911914
target: CommonTriple::X86_64_WINDOWS_MSVC,
912915
resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_intel_tdx_x86,
913-
nextest_filter_expr: "test(tdx) + (test(vbs) & test(hyperv))".to_string(),
914-
test_artifacts: vec![KnownTestArtifacts::Gen2WindowsDataCenterCore2025X64Vhd],
916+
nextest_filter_expr: cvm_filter("tdx"),
917+
test_artifacts: cvm_x64_test_artifacts.clone(),
915918
},
916919
VmmTestJobParams {
917920
platform: FlowPlatform::Windows,
@@ -930,8 +933,8 @@ impl IntoPipeline for CheckinGatesCli {
930933
label: "x64-windows-amd-snp",
931934
target: CommonTriple::X86_64_WINDOWS_MSVC,
932935
resolve_vmm_tests_artifacts: vmm_tests_artifacts_windows_amd_snp_x86,
933-
nextest_filter_expr: "test(snp)".to_string(),
934-
test_artifacts: vec![KnownTestArtifacts::Gen2WindowsDataCenterCore2025X64Vhd],
936+
nextest_filter_expr: cvm_filter("snp"),
937+
test_artifacts: cvm_x64_test_artifacts,
935938
},
936939
VmmTestJobParams {
937940
platform: FlowPlatform::Linux(FlowPlatformLinuxDistro::Ubuntu),

0 commit comments

Comments
 (0)