From 30acb5a0c00de91925be3609b805608e28f7f671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Tue, 28 Nov 2023 15:15:10 +0100
Subject: [PATCH] tests: nydus: Adapt the default config file for runtime-rs
 based drivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we've done some changes in the runtime-rs based drivers to install
their configuration into a different location, this should also be
reflected as part of this test.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tests/integration/nydus/nydus_tests.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/integration/nydus/nydus_tests.sh b/tests/integration/nydus/nydus_tests.sh
index 9e3f655b9..41a4cbbfc 100755
--- a/tests/integration/nydus/nydus_tests.sh
+++ b/tests/integration/nydus/nydus_tests.sh
@@ -21,7 +21,7 @@ kata_config_backup="/tmp/kata-configuration.toml"
 SYSCONFIG_FILE="/etc/kata-containers/configuration.toml"
 DEFAULT_CONFIG_FILE="/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
 CLH_CONFIG_FILE="/opt/kata/share/defaults/kata-containers/configuration-clh.toml"
-DB_CONFIG_FILE="/opt/kata/share/defaults/kata-containers/configuration-dragonball.toml"
+DB_CONFIG_FILE="/opt/kata/share/defaults/kata-containers/runtime-rs/configuration-dragonball.toml"
 need_restore_containerd_config=false
 containerd_config="/etc/containerd/config.toml"
 containerd_config_backup="/tmp/containerd.config.toml"
@@ -34,6 +34,14 @@ if [ "$KATA_HYPERVISOR" != "qemu" ] && [ "$KATA_HYPERVISOR" != "clh" ] && [ "$KA
 	exit 0
 fi
 
+case "$KATA_HYPERVISOR" in
+	dragonball)
+		SYSCONFIG_FILE="/etc/kata-containers/runtime-rs/configuration.toml"
+		;;
+	*)
+		;;
+esac
+
 function setup_nydus() {
 	# Config nydus snapshotter
 	sudo -E cp "$dir_path/nydusd-config.json" /etc/
@@ -46,7 +54,7 @@ function setup_nydus() {
 }
 
 function config_kata() {
-	sudo mkdir -p /etc/kata-containers
+	sudo mkdir -p $(dirname $SYSCONFIG_FILE)
 	if [ -f "$SYSCONFIG_FILE" ]; then
 		need_restore_kata_config=true
 		sudo cp -a "${SYSCONFIG_FILE}" "${kata_config_backup}"