From f3eeab10ab2cafcf202b109c85e4bf72fc45905f Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Fri, 8 Dec 2023 16:12:36 +0000 Subject: [PATCH 1/2] tests: nerdctl: Enable nerdctl tests for cloud hypervisor runtime-rs This PR enables the nerdctl tests for cloud hypervisor runtime-rs. Fixes #8616 Signed-off-by: Gabriela Cervantes --- tests/integration/nerdctl/gha-run.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/integration/nerdctl/gha-run.sh b/tests/integration/nerdctl/gha-run.sh index d24a3eda58..e867d6c2e9 100644 --- a/tests/integration/nerdctl/gha-run.sh +++ b/tests/integration/nerdctl/gha-run.sh @@ -59,11 +59,6 @@ function install_dependencies() { } function run() { - if [ "${KATA_HYPERVISOR}" = "cloud-hypervisor" ]; then - echo "Skipping test for ${KATA_HYPERVISOR}" - return 0 - fi - info "Running nerdctl smoke test tests using ${KATA_HYPERVISOR} hypervisor" enabling_hypervisor From 1662a3e859159372036e526c07ca99a88a58f12e Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Fri, 8 Dec 2023 21:32:00 +0000 Subject: [PATCH 2/2] common: Add cloud hypervisor in enabling hypervisor function This PR adds the cloud hypervisor in the enabling hypervisor function. Signed-off-by: Gabriela Cervantes --- tests/common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.bash b/tests/common.bash index e941792d4c..fe561cefb5 100644 --- a/tests/common.bash +++ b/tests/common.bash @@ -402,7 +402,7 @@ function enabling_hypervisor() { declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2" case "${KATA_HYPERVISOR}" in - dragonball) + dragonball | cloud-hypervisor) 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" ;;