diff --git a/.github/workflows/openvmm-ci.yaml b/.github/workflows/openvmm-ci.yaml index b79266eab3..ee7c17db31 100644 --- a/.github/workflows/openvmm-ci.yaml +++ b/.github/workflows/openvmm-ci.yaml @@ -1550,7 +1550,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 13 flowey_lib_hvlite::run_split_debug_info 3 + flowey e 13 flowey_lib_hvlite::run_split_debug_info 4 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 27 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 28 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 31 @@ -1584,7 +1584,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 13 flowey_lib_hvlite::run_split_debug_info 4 + flowey e 13 flowey_lib_hvlite::run_split_debug_info 0 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 39 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 40 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 43 @@ -1609,7 +1609,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 13 flowey_lib_hvlite::run_split_debug_info 1 + flowey e 13 flowey_lib_hvlite::run_split_debug_info 2 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 51 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 52 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 55 @@ -1635,7 +1635,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 13 flowey_lib_hvlite::run_split_debug_info 2 + flowey e 13 flowey_lib_hvlite::run_split_debug_info 3 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 15 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 16 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 19 @@ -1657,7 +1657,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 13 flowey_lib_hvlite::run_split_debug_info 0 + flowey e 13 flowey_lib_hvlite::run_split_debug_info 1 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 3 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 4 flowey e 13 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 7 diff --git a/.github/workflows/openvmm-pr.yaml b/.github/workflows/openvmm-pr.yaml index 5b3075b0b3..5aad91a079 100644 --- a/.github/workflows/openvmm-pr.yaml +++ b/.github/workflows/openvmm-pr.yaml @@ -1234,7 +1234,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 12 flowey_lib_hvlite::run_split_debug_info 3 + flowey e 12 flowey_lib_hvlite::run_split_debug_info 4 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 27 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 28 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 31 @@ -1268,7 +1268,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 12 flowey_lib_hvlite::run_split_debug_info 4 + flowey e 12 flowey_lib_hvlite::run_split_debug_info 0 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 39 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 40 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 43 @@ -1293,7 +1293,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 12 flowey_lib_hvlite::run_split_debug_info 1 + flowey e 12 flowey_lib_hvlite::run_split_debug_info 2 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 51 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 52 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 55 @@ -1319,7 +1319,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 12 flowey_lib_hvlite::run_split_debug_info 2 + flowey e 12 flowey_lib_hvlite::run_split_debug_info 3 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 15 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 16 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 19 @@ -1341,7 +1341,7 @@ jobs: shell: bash - name: split debug symbols run: |- - flowey e 12 flowey_lib_hvlite::run_split_debug_info 0 + flowey e 12 flowey_lib_hvlite::run_split_debug_info 1 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 3 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 4 flowey e 12 flowey_lib_hvlite::build_openhcl_igvm_from_recipe 7 diff --git a/flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs b/flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs index 2161be0cce..cbe7b39e99 100644 --- a/flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs +++ b/flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs @@ -29,7 +29,7 @@ pub const NODEJS: &str = "18.x"; // N.B. Kernel version numbers for dev and stable branches are not directly // comparable. They originate from separate branches, and the fourth digit // increases with each release from the respective branch. -pub const OPENHCL_KERNEL_DEV_VERSION: &str = "6.12.9.1"; +pub const OPENHCL_KERNEL_DEV_VERSION: &str = "6.12.9.2"; pub const OPENHCL_KERNEL_STABLE_VERSION: &str = "6.12.9.2"; pub const OPENVMM_DEPS: &str = "0.1.0-20250403.3"; pub const PROTOC: &str = "27.1"; diff --git a/flowey/flowey_lib_hvlite/src/build_openhcl_igvm_from_recipe.rs b/flowey/flowey_lib_hvlite/src/build_openhcl_igvm_from_recipe.rs index 9a3eb9352f..4a14731b21 100644 --- a/flowey/flowey_lib_hvlite/src/build_openhcl_igvm_from_recipe.rs +++ b/flowey/flowey_lib_hvlite/src/build_openhcl_igvm_from_recipe.rs @@ -129,7 +129,7 @@ impl OpenhclIgvmRecipe { vtl0_kernel_type: None, with_uefi: true, with_interactive, - with_sidecar: false, + with_sidecar: true, }, Self::X64Devkern => OpenhclIgvmRecipeDetails { local_only: None, @@ -168,7 +168,7 @@ impl OpenhclIgvmRecipe { vtl0_kernel_type: Some(Vtl0KernelType::Example), with_uefi: false, with_interactive, - with_sidecar: false, + with_sidecar: true, }, Self::X64TestLinuxDirectDevkern => OpenhclIgvmRecipeDetails { local_only: None, @@ -182,7 +182,7 @@ impl OpenhclIgvmRecipe { vtl0_kernel_type: Some(Vtl0KernelType::Example), with_uefi: false, with_interactive, - with_sidecar: false, + with_sidecar: true, }, Self::X64Cvm => OpenhclIgvmRecipeDetails { local_only: None, diff --git a/flowey/flowey_lib_hvlite/src/download_openhcl_kernel_package.rs b/flowey/flowey_lib_hvlite/src/download_openhcl_kernel_package.rs index 3058f73021..cf83274760 100644 --- a/flowey/flowey_lib_hvlite/src/download_openhcl_kernel_package.rs +++ b/flowey/flowey_lib_hvlite/src/download_openhcl_kernel_package.rs @@ -81,7 +81,7 @@ impl FlowNode for Node { let tag = format!( "rolling-lts/hcl-{}/{}", match kind { - OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => "main", + OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => "dev", OpenhclKernelPackageKind::Dev | OpenhclKernelPackageKind::CvmDev => "dev", }, version @@ -91,7 +91,7 @@ impl FlowNode for Node { "Microsoft.OHCL.Kernel{}.{}{}-{}.tar.gz", match kind { OpenhclKernelPackageKind::Main | OpenhclKernelPackageKind::Cvm => { - "" + ".Dev" } OpenhclKernelPackageKind::Dev | OpenhclKernelPackageKind::CvmDev => { ".Dev" diff --git a/vmm_tests/vmm_tests/tests/tests/x86_64.rs b/vmm_tests/vmm_tests/tests/tests/x86_64.rs index 8c4381c860..c745c6f939 100644 --- a/vmm_tests/vmm_tests/tests/tests/x86_64.rs +++ b/vmm_tests/vmm_tests/tests/tests/x86_64.rs @@ -16,7 +16,7 @@ use petri::ShutdownKind; use petri::openvmm::PetriVmConfigOpenVmm; use petri::pipette::cmd; use petri_artifacts_common::tags::OsFlavor; -use petri_artifacts_vmm_test::artifacts::openhcl_igvm::LATEST_STANDARD_DEV_KERNEL_X64; +use petri_artifacts_vmm_test::artifacts::openhcl_igvm::LATEST_STANDARD_X64; use vmm_core_defs::HaltReason; use vmm_test_macros::openvmm_test; use vmm_test_macros::vmm_test; @@ -305,7 +305,7 @@ async fn battery_capacity(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Er fn configure_for_sidecar( config: Box, - igvm: ResolvedArtifact, + igvm: ResolvedArtifact, proc_count: u32, ) -> Box { config @@ -323,19 +323,17 @@ fn configure_for_sidecar( }) } -// Sidecar currently requires the dev kernel build. -// // Use UEFI so that the guest doesn't access the other APs, causing hot adds // into VTL2 Linux. // // Sidecar isn't supported on aarch64 yet. #[vmm_test( - openvmm_openhcl_uefi_x64(none) [LATEST_STANDARD_DEV_KERNEL_X64], - // TODO: debug why boot is failing hyperv_openhcl_uefi_x64(none) [LATEST_STANDARD_DEV_KERNEL_X64], + openvmm_openhcl_uefi_x64(none) [LATEST_STANDARD_X64], + // TODO: debug why boot is failing hyperv_openhcl_uefi_x64(none) [LATEST_STANDARD_X64], )] async fn sidecar_aps_unused( config: Box, - (igvm,): (ResolvedArtifact,), + (igvm,): (ResolvedArtifact,), ) -> Result<(), anyhow::Error> { let proc_count = 4; let mut vm = configure_for_sidecar(config, igvm, proc_count) @@ -367,12 +365,12 @@ async fn sidecar_aps_unused( } #[vmm_test( - openvmm_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_DEV_KERNEL_X64], - // TODO: debug why boot is failing hyperv_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_DEV_KERNEL_X64], + openvmm_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_X64], + // TODO: debug why boot is failing hyperv_openhcl_uefi_x64(vhd(ubuntu_2204_server_x64)) [LATEST_STANDARD_X64], )] async fn sidecar_boot( config: Box, - (igvm,): (ResolvedArtifact,), + (igvm,): (ResolvedArtifact,), ) -> Result<(), anyhow::Error> { let (vm, agent) = configure_for_sidecar(config, igvm, 4).run().await?; agent.power_off().await?;