From e8405590c1aadea21d510b25a2612fe93191fc10 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Wed, 5 Mar 2025 00:38:48 +0000 Subject: [PATCH] ci: temporarily avoid using the Mariner Host image Disable the Mariner host during CI, while investigating test failures with new Cloud Hypervisor v43.0. Signed-off-by: Dan Mihai --- tests/gha-run-k8s-common.sh | 3 +-- tests/integration/kubernetes/setup.sh | 5 +---- tests/integration/kubernetes/tests_common.sh | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index a326be67b..94da8fbd6 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -124,8 +124,7 @@ function create_cluster() { -s "$(_print_instance_type)" \ --node-count 1 \ --generate-ssh-keys \ - --tags "${tags[@]}" \ - $([[ "${KATA_HOST_OS}" = "cbl-mariner" ]] && echo "--os-sku AzureLinux --workload-runtime KataMshvVmIsolation") + --tags "${tags[@]}" } function install_bats() { diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index f6e44a21b..188864cbb 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -101,16 +101,13 @@ add_annotations_to_yaml() { add_cbl_mariner_specific_annotations() { if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then - info "Add kernel and image path and annotations for cbl-mariner" - local mariner_annotation_kernel="io.katacontainers.config.hypervisor.kernel" - local mariner_kernel_path="/usr/share/cloud-hypervisor/vmlinux.bin" + info "Add image path annotation for cbl-mariner" local mariner_annotation_image="io.katacontainers.config.hypervisor.image" local mariner_image_path="/opt/kata/share/kata-containers/kata-containers-mariner.img" 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_image}" "${mariner_image_path}" done fi diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index aa6c7a6c9..911a34a3e 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -108,10 +108,7 @@ adapt_common_policy_settings_for_virtio_fs() { # adapt common policy settings for CBL-Mariner Hosts adapt_common_policy_settings_for_cbl_mariner() { - local settings_dir=$1 - - info "Adapting common policy settings for KATA_HOST_OS=cbl-mariner" - 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" + true } # adapt common policy settings for various platforms