vbs on 22.04

microsoft · Feb 4, 2025 · bae4490 · bae4490
1 parent 2d4517f
commit bae4490
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/flowey/flowey_lib_hvlite/src/_jobs/build_and_run_nextest_vmm_tests.rs b/flowey/flowey_lib_hvlite/src/_jobs/build_and_run_nextest_vmm_tests.rs
@@ -177,6 +177,7 @@ impl SimpleFlowNode for Node {
                         vmm_test_images::KnownVhd::Gen1WindowsDataCenterCore2022,
                         vmm_test_images::KnownVhd::Gen2WindowsDataCenterCore2022,
                         vmm_test_images::KnownVhd::Ubuntu2204Server,
+                        vmm_test_images::KnownVhd::Ubuntu2404ServerX64,
                     ]),
                 ]);
 

diff --git a/flowey/flowey_lib_hvlite/src/_jobs/consume_and_test_nextest_vmm_tests_archive.rs b/flowey/flowey_lib_hvlite/src/_jobs/consume_and_test_nextest_vmm_tests_archive.rs
@@ -139,6 +139,7 @@ impl SimpleFlowNode for Node {
                             vmm_test_images::KnownVhd::FreeBsd13_2,
                             vmm_test_images::KnownVhd::Gen1WindowsDataCenterCore2022,
                             vmm_test_images::KnownVhd::Gen2WindowsDataCenterCore2022,
+                            vmm_test_images::KnownVhd::Ubuntu2204Server,
                             vmm_test_images::KnownVhd::Ubuntu2404ServerX64,
                         ]),
                     ]);

diff --git a/vmm_tests/vmm_tests/tests/tests/x86_64.rs b/vmm_tests/vmm_tests/tests/tests/x86_64.rs
@@ -97,7 +97,7 @@ async fn boot_with_tpm(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
 /// Basic VBS boot test.
 #[openvmm_test(
     openhcl_uefi_x64[vbs](vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64[vbs](vhd(ubuntu_2404_server_x64))
+    openhcl_uefi_x64[vbs](vhd(ubuntu_2204_server_x64))
 )]
 async fn vbs_boot(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let mut vm = config.run_without_agent().await?;
@@ -110,7 +110,7 @@ async fn vbs_boot(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
 /// Basic VBS boot test with a single VP.
 #[openvmm_test(
     openhcl_uefi_x64[vbs](vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64[vbs](vhd(ubuntu_2404_server_x64))
+    openhcl_uefi_x64[vbs](vhd(ubuntu_2204_server_x64))
 )]
 async fn vbs_boot_single_proc(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let mut vm = config.with_single_processor().run_without_agent().await?;
@@ -123,7 +123,7 @@ async fn vbs_boot_single_proc(config: PetriVmConfigOpenVmm) -> anyhow::Result<()
 /// Basic VBS boot test with TPM enabled.
 #[openvmm_test(
     openhcl_uefi_x64[vbs](vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64[vbs](vhd(ubuntu_2404_server_x64))
+    openhcl_uefi_x64[vbs](vhd(ubuntu_2204_server_x64))
 )]
 async fn vbs_boot_with_tpm(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let os_flavor = config.os_flavor();
@@ -175,7 +175,7 @@ async fn reboot(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
 /// Basic VBS reboot test.
 #[openvmm_test(
     openhcl_uefi_x64[vbs](vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64[vbs](vhd(ubuntu_2404_server_x64))
+    openhcl_uefi_x64[vbs](vhd(ubuntu_2204_server_x64))
 )]
 async fn vbs_reboot(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let mut vm = config.run_without_agent().await?;