Switch Test VHD to Ubuntu 24.04

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,
                     ]),
                 ]);
 

flowey/flowey_lib_hvlite/src/_jobs/consume_and_test_nextest_vmm_tests_archive.rs

@@ -140,6 +140,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,
                         ]),
                     ]);
 

vmm_tests/petri_artifact_resolver_openvmm_known_paths/src/lib.rs

@@ -69,6 +69,7 @@ impl petri_artifacts_core::ResolveTestArtifact for OpenvmmKnownPathsTestArtifact
             _ if id == test_vhd::FREE_BSD_13_2_X64 => get_guest_vhd_path(KnownVhd::FreeBsd13_2),
             _ if id == test_vhd::UBUNTU_2204_SERVER_X64 => get_guest_vhd_path(KnownVhd::Ubuntu2204Server),
             _ if id == test_vhd::UBUNTU_2404_SERVER_AARCH64 => get_guest_vhd_path(KnownVhd::Ubuntu2404ServerAarch64),
+            _ if id == test_vhd::UBUNTU_2404_SERVER_X64 => get_guest_vhd_path(KnownVhd::Ubuntu2404ServerX64),
 
             _ if id == test_iso::FREE_BSD_13_2_X64 => get_guest_iso_path(KnownIso::FreeBsd13_2),
 

vmm_tests/petri_artifacts_vmm_test/src/lib.rs

@@ -275,6 +275,21 @@ pub mod artifacts {
             const FILENAME: &'static str = "ubuntu-24.04-server-cloudimg-arm64.vhd";
             const SIZE: u64 = 3758211584;
         }
+
+        declare_artifacts! {
+            /// Ubuntu 24.04 Server X64
+            UBUNTU_2404_SERVER_X64
+        }
+
+        impl IsTestVhd for UBUNTU_2404_SERVER_X64 {
+            const OS_FLAVOR: OsFlavor = OsFlavor::Linux;
+            const ARCH: MachineArch = MachineArch::X86_64;
+        }
+
+        impl IsHostedOnHvliteAzureBlobStore for UBUNTU_2404_SERVER_X64 {
+            const FILENAME: &'static str = "ubuntu-24.04-server-cloudimg-amd64.vhd";
+            const SIZE: u64 = 3758211584;
+        }
     }
 
     /// Test ISO artifacts

vmm_tests/vmm_test_images/src/lib.rs

@@ -30,6 +30,7 @@ pub enum KnownVhd {
     FreeBsd13_2,
     Ubuntu2204Server,
     Ubuntu2404ServerAarch64,
+    Ubuntu2404ServerX64,
 }
 
 struct KnownVhdMeta {
@@ -75,6 +76,11 @@ const KNOWN_VHD_METADATA: &[KnownVhdMeta] = &[
         petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_AARCH64::FILENAME,
         petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_AARCH64::SIZE,
     ),
+    KnownVhdMeta::new(
+        KnownVhd::Ubuntu2404ServerX64,
+        petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_X64::FILENAME,
+        petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_X64::SIZE,
+    ),
 ];
 
 impl KnownVhd {

vmm_tests/vmm_test_macros/src/lib.rs

@@ -529,6 +529,9 @@ fn parse_vhd(input: ParseStream<'_>, generation: Generation) -> syn::Result<Imag
         "ubuntu_2404_server_aarch64" => Ok(image_info!(
             ::petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_AARCH64
         )),
+        "ubuntu_2404_server_x64" => Ok(image_info!(
+            ::petri_artifacts_vmm_test::artifacts::test_vhd::UBUNTU_2404_SERVER_X64
+        )),
         _ => Err(Error::new(word.span(), "unrecognized vhd")),
     }
 }
@@ -673,7 +676,7 @@ fn parse_extra_deps(input: ParseStream<'_>) -> syn::Result<Vec<Path>> {
 /// - `none`: No guest
 ///
 /// Valid VHD options are:
-/// - `ubuntu_2204_server_x64`: Canonical's provided Ubuntu Linux 22.04 cloudimg disk image
+/// - `ubuntu_2404_server_x64`: Canonical's provided Ubuntu Linux 22.04 cloudimg disk image
 /// - `windows_datacenter_core_2022_x64`: Our provided Windows Datacenter Core 2022 VHD
 /// - `freebsd_13_2_x64`: The FreeBSD Project's provided FreeBSD 13.2 VHD
 ///

vmm_tests/vmm_tests/tests/tests/multiarch.rs

@@ -29,12 +29,12 @@ async fn frontpage(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     hyperv_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
     openvmm_pcat_x64(vhd(windows_datacenter_core_2022_x64)),
     hyperv_pcat_x64(vhd(windows_datacenter_core_2022_x64)),
-    openvmm_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    hyperv_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    openvmm_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    hyperv_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    openvmm_pcat_x64(vhd(ubuntu_2204_server_x64)),
-    hyperv_pcat_x64(vhd(ubuntu_2204_server_x64)),
+    openvmm_openhcl_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    hyperv_openhcl_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    openvmm_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    hyperv_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    openvmm_pcat_x64(vhd(ubuntu_2404_server_x64)),
+    hyperv_pcat_x64(vhd(ubuntu_2404_server_x64)),
     openvmm_uefi_aarch64(vhd(ubuntu_2404_server_aarch64)),
     hyperv_uefi_aarch64(vhd(ubuntu_2404_server_aarch64)),
     hyperv_openhcl_uefi_aarch64(vhd(ubuntu_2404_server_aarch64))

vmm_tests/vmm_tests/tests/tests/x86_64.rs

@@ -31,7 +31,7 @@ async fn boot_no_agent(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
 #[openvmm_test(
     openhcl_linux_direct_x64,
     openhcl_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64(vhd(ubuntu_2204_server_x64))
+    openhcl_uefi_x64(vhd(ubuntu_2404_server_x64))
 )]
 async fn boot_alias_map(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let (vm, agent) = config.with_vtl0_alias_map().run().await?;
@@ -43,7 +43,7 @@ async fn boot_alias_map(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
 /// Basic boot tests with TPM enabled.
 #[openvmm_test(
     openhcl_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64(vhd(ubuntu_2204_server_x64))
+    openhcl_uefi_x64(vhd(ubuntu_2404_server_x64))
 )]
 async fn boot_with_tpm(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     let os_flavor = config.os_flavor();
@@ -149,9 +149,9 @@ async fn vbs_boot_with_tpm(config: PetriVmConfigOpenVmm) -> anyhow::Result<()> {
     // openhcl_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
     // uefi_x64(vhd(windows_datacenter_core_2022_x64)),
     // pcat_x64(vhd(windows_datacenter_core_2022_x64)),
-    // openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    // uefi_x64(vhd(ubuntu_2204_server_x64)),
-    // pcat_x64(vhd(ubuntu_2204_server_x64))
+    // openhcl_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    // uefi_x64(vhd(ubuntu_2404_server_x64)),
+    // pcat_x64(vhd(ubuntu_2404_server_x64))
 )]
 async fn reboot(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     let (mut vm, agent) = config.run().await?;
@@ -265,8 +265,8 @@ async fn five_gb(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     openhcl_linux_direct_x64,
     openhcl_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
     uefi_x64(vhd(windows_datacenter_core_2022_x64)),
-    openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)),
-    uefi_x64(vhd(ubuntu_2204_server_x64))
+    openhcl_uefi_x64(vhd(ubuntu_2404_server_x64)),
+    uefi_x64(vhd(ubuntu_2404_server_x64))
 )]
 async fn file_transfer_test(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     const TEST_CONTENT: &str = "hello world!";
@@ -326,7 +326,7 @@ async fn mtrrs(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
 /// Boot with vmbus redirection and shut down.
 #[openvmm_test(
     openhcl_linux_direct_x64,
-    openhcl_uefi_x64(vhd(ubuntu_2204_server_x64))
+    openhcl_uefi_x64(vhd(ubuntu_2404_server_x64))
 )]
 async fn vmbus_redirect(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     let (mut vm, agent) = config.with_vmbus_redirect().run().await?;
@@ -338,9 +338,9 @@ async fn vmbus_redirect(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Erro
 
 /// Boot with a battery and check the OS-reported capacity.
 #[openvmm_test(
-    openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)),
+    openhcl_uefi_x64(vhd(ubuntu_2404_server_x64)),
     openhcl_uefi_x64(vhd(windows_datacenter_core_2022_x64)),
-    uefi_x64(vhd(ubuntu_2204_server_x64)),
+    uefi_x64(vhd(ubuntu_2404_server_x64)),
     uefi_x64(vhd(windows_datacenter_core_2022_x64))
 )]
 async fn battery_capacity(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {

vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_uefi.rs

@@ -27,7 +27,7 @@ async fn nvme_relay_test_core(
 
 /// Test an OpenHCL uefi VM with a NVME disk assigned to VTL2 that boots
 /// linux, with vmbus relay. This should expose a disk to VTL0 via vmbus.
-#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2204_server_x64)))]
+#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2404_server_x64)))]
 async fn nvme_relay(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     nvme_relay_test_core(config, "").await
 }
@@ -36,7 +36,7 @@ async fn nvme_relay(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
 /// linux, with vmbus relay. This should expose a disk to VTL0 via vmbus.
 ///
 /// Use the shared pool override to test the shared pool dma path.
-#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2204_server_x64)))]
+#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2404_server_x64)))]
 async fn nvme_relay_shared_pool(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     nvme_relay_test_core(config, "OPENHCL_ENABLE_SHARED_VISIBILITY_POOL=1").await
 }
@@ -45,7 +45,7 @@ async fn nvme_relay_shared_pool(config: PetriVmConfigOpenVmm) -> Result<(), anyh
 /// linux, with vmbus relay. This should expose a disk to VTL0 via vmbus.
 ///
 /// Use the private pool override to test the private pool dma path.
-#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2204_server_x64)))]
+#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2404_server_x64)))]
 async fn nvme_relay_private_pool(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
     // Number of pages to reserve as a private pool.
     nvme_relay_test_core(config, "OPENHCL_ENABLE_VTL2_GPA_POOL=1024").await