From a3dba3e82b367a1160eb53d71030e85335d4c897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Thu, 18 Jul 2024 20:38:24 +0000 Subject: [PATCH] ci: reinstate Mariner host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GH-9592 addressed a bug in a previous version of the AKS Mariner host kernel that blocked the CH v39 upgrade. This bug has now been fixed so we undo that PR. Note we also specify a different OCI version for Mariner as it differs from Ubuntu's. Fixes: #9594 Signed-off-by: Aurélien Bombo --- tests/gha-run-k8s-common.sh | 3 ++- tests/integration/kubernetes/setup.sh | 1 + tests/integration/kubernetes/tests_common.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 28f876a8b..fa3184cba 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -96,7 +96,8 @@ function create_cluster() { -n "$(_print_cluster_name ${test_type})" \ -s "$(_print_instance_type)" \ --node-count 1 \ - --generate-ssh-keys + --generate-ssh-keys \ + $([ "${KATA_HOST_OS}" = "cbl-mariner" ] && echo "--os-sku AzureLinux --workload-runtime KataMshvVmIsolation") } function install_bats() { diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index 907ad636c..f3354a9ee 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -110,6 +110,7 @@ add_cbl_mariner_kernel_initrd_annotations() { for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml do + add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_kernel}" "${mariner_kernel_path}" add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_initrd}" "${mariner_initrd_path}" done fi diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 192bc637b..86780711d 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -159,6 +159,7 @@ adapt_common_policy_settings_for_cbl_mariner() { info "Adapting common policy settings for CBL-Mariner" jq '.request_defaults.UpdateEphemeralMountsRequest = true' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json" + jq '.kata_config.oci_version = "1.1.0-rc.1"' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json" } # adapt common policy settings for various platforms