From ab13d3be99db24a8efafd2c4d7e53c4b49e4aa57 Mon Sep 17 00:00:00 2001 From: Annu Sharma Date: Tue, 5 May 2026 14:40:14 +0100 Subject: [PATCH] tests: Integration test support for virtio-mem Enabled TestContainerMemoryUpdate support for runtime-rs on s390x and disabled static_sandbox_resource_mgmt to dynamically update the memory. Signed-off-by: Annu Sharma --- .../cri-containerd/integration-tests.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 8a680a54c8..e51778547a 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -384,12 +384,14 @@ function TestContainerMemoryUpdate() { fi if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then - # Remove TestContainerMemoryUpdate from passing_test - info "TestContainerMemoryUpdate skipped for qemu with runtime-rs" - info "Please check out https://github.com/kata-containers/kata-containers/issues/9375" - return + if [[ "${ARCH}" != "s390x" ]]; then + # Remove TestContainerMemoryUpdate from passing_test + info "Currently TestContainerMemoryUpdate is only supported on s390x for runtime-rs" + info "For other architectures, please check out https://github.com/kata-containers/kata-containers/issues/9375" + return + fi elif [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]]; then - return + return fi for virtio_mem_enabled in 1 0; do @@ -413,6 +415,8 @@ function PrepareContainerMemoryUpdate() { # Handle both commented and uncommented enable_virtio_mem sudo sed -i -e 's/^#\?enable_virtio_mem.*$/enable_virtio_mem = true/g' "${kata_config}" + # Handle both commented and uncommented static_sandbox_resource_mgmt, set to false + sudo sed -i -e 's/^#\?\s*static_sandbox_resource_mgmt.*$/static_sandbox_resource_mgmt = false/g' "${kata_config}" else info "Test container memory update without virtio-mem"