From 3bbf3c81c2330299a14fde03afa59224ddbb27d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 8 Oct 2024 21:21:54 +0200 Subject: [PATCH] ci: mariner: Use the image instead of the initrd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As an image has been added for mariner as part of the commit 63c1f81c2, let's start using it in the CI, instead of using the initrd. Signed-off-by: Fabiano Fidêncio --- tests/integration/kubernetes/gha-run.sh | 2 +- tests/integration/kubernetes/setup.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index ccfef0d63e..86af65f69d 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -183,7 +183,7 @@ function deploy_kata() { fi if [ "${KATA_HOST_OS}" = "cbl-mariner" ]; then - yq -i ".env.allowedHypervisorAnnotations = \"initrd kernel default_vcpus\"" "${values_yaml}" + yq -i ".env.allowedHypervisorAnnotations = \"image kernel default_vcpus\"" "${values_yaml}" yq -i ".env.hostOS = \"${KATA_HOST_OS}\"" "${values_yaml}" fi diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index a72c7c743f..f6e44a21bf 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -99,19 +99,19 @@ add_annotations_to_yaml() { esac } -add_cbl_mariner_kernel_initrd_annotations() { +add_cbl_mariner_specific_annotations() { if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then - info "Add kernel and initrd path and annotations for cbl-mariner" + 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" - local mariner_annotation_initrd="io.katacontainers.config.hypervisor.initrd" - local mariner_initrd_path="/opt/kata/share/kata-containers/kata-containers-initrd-mariner.img" + 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_initrd}" "${mariner_initrd_path}" + add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_image}" "${mariner_image_path}" done fi } @@ -139,7 +139,7 @@ add_runtime_handler_annotations() { main() { ensure_yq reset_workloads_work_dir - add_cbl_mariner_kernel_initrd_annotations + add_cbl_mariner_specific_annotations add_runtime_handler_annotations }