From 8fd39d11c40bd3a0919e577adae46015f56abcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 29 Nov 2023 10:10:39 +0100 Subject: [PATCH] tests: Adapt `enable_hypervisor`to the runtime-rs config location change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the configuration for the runtime-rs based drivers are now placed in a different location than the golang ones, we should adapt this script accordingly. Signed-off-by: Fabiano Fidêncio --- tests/common.bash | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/common.bash b/tests/common.bash index e0c9490fb6..e3b1e67398 100644 --- a/tests/common.bash +++ b/tests/common.bash @@ -399,16 +399,21 @@ function install_kata() { # points to the hypervisor passed by KATA_HYPERVISOR env var. function enabling_hypervisor() { declare -r KATA_DIR="/opt/kata" - declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers" - declare -r SRC_HYPERVISOR_CONFIG="${CONFIG_DIR}/configuration-${KATA_HYPERVISOR}.toml" - declare -r DEST_KATA_CONFIG="${CONFIG_DIR}/configuration.toml" declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2" - if [[ ${KATA_HYPERVISOR} == "dragonball" ]]; then - sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}" - else - sudo ln -sf "${KATA_DIR}/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}" - fi + case "${KATA_HYPERVISOR}" in + dragonball) + 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" + ;; + *) + sudo ln -sf "${KATA_DIR}/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}" + declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers" + ;; + esac + + declare -r SRC_HYPERVISOR_CONFIG="${CONFIG_DIR}/configuration-${KATA_HYPERVISOR}.toml" + declare -r DEST_KATA_CONFIG="${CONFIG_DIR}/configuration.toml" sudo ln -sf "${SRC_HYPERVISOR_CONFIG}" "${DEST_KATA_CONFIG}" }