From d37feac6793bdf32f18ce24ec6a8a2340a628dad Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Tue, 10 Jun 2025 01:13:46 +0000 Subject: [PATCH] tests: test mariner with disable_image_nvdimm=true Run the k8s tests on mariner with annotation disable_image_nvdimm=true, to use virtio-blk instead of nvdimm for the guest rootfs block device. Signed-off-by: Dan Mihai --- tests/integration/kubernetes/gha-run.sh | 2 +- tests/integration/kubernetes/setup.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 7149545ee..fe95d7997 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -175,7 +175,7 @@ function deploy_kata() { ANNOTATIONS="default_vcpus" if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then - ANNOTATIONS="image kernel default_vcpus" + ANNOTATIONS="image kernel default_vcpus disable_image_nvdimm" fi if [[ "${KATA_HYPERVISOR}" = "qemu" ]]; then ANNOTATIONS="image initrd kernel default_vcpus" diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index 188864cbb..96a9a3061 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -106,9 +106,13 @@ add_cbl_mariner_specific_annotations() { local mariner_annotation_image="io.katacontainers.config.hypervisor.image" local mariner_image_path="/opt/kata/share/kata-containers/kata-containers-mariner.img" + local mariner_annotation_disable_image_nvdimm="io.katacontainers.config.hypervisor.disable_image_nvdimm" + local mariner_disable_image_nvdimm=true + for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml do add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_image}" "${mariner_image_path}" + add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_disable_image_nvdimm}" "${mariner_disable_image_nvdimm}" done fi }