ci|cri-containerd: Introduce qemu-runtime-rs for KATA_HYPERVISOR

`qemu-runtime-rs` will be utilized to handle a test scenario where
the VMM is QEMU and runtime-rs is employed.

Note: Some of the tests are skipped. They are going to be reintegrated in
the follow-up PR (Check out #9375).

Fixes: #9371

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi
2024-03-28 09:34:07 +01:00
parent 7795f9c016
commit 3c217c6c15
2 changed files with 15 additions and 4 deletions

View File

@@ -450,7 +450,7 @@ function enabling_hypervisor() {
declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2"
case "${KATA_HYPERVISOR}" in
dragonball | cloud-hypervisor)
dragonball|cloud-hypervisor|qemu-runtime-rs)
sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}"
declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers/runtime-rs"
;;

View File

@@ -255,7 +255,12 @@ function TestContainerMemoryUpdate() {
DoContainerMemoryUpdate 0
fi
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
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
elif [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
return
fi
@@ -657,8 +662,14 @@ function main() {
TestContainerMemoryUpdate
if [[ "${ARCH}" != "ppc64le" ]]; then
TestKilledVmmCleanup
TestDeviceCgroup
if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then
info "TestKilledVmmCleanup and TestDeviceCgroup skipped for qemu with runtime-rs"
info "Please check out https://github.com/kata-containers/kata-containers/issues/9375"
break
else
TestKilledVmmCleanup
TestDeviceCgroup
fi
fi
popd