From b8a8dfcd15aa6a894b48e8eb61fa8d0f09a030ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 18 Sep 2023 11:48:05 +0200 Subject: [PATCH] nydus: Use `kata-${KATA_HYPERVISOR}` instead of `kata` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will ensure we're testing with the correct runtime, instead of using the `default` one. Signed-off-by: Fabiano Fidêncio --- tests/integration/nydus/nydus_tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/nydus/nydus_tests.sh b/tests/integration/nydus/nydus_tests.sh index e90b2498c6..9e3f655b9c 100755 --- a/tests/integration/nydus/nydus_tests.sh +++ b/tests/integration/nydus/nydus_tests.sh @@ -99,8 +99,8 @@ function config_containerd() { [plugins.cri.containerd.runtimes.runc.options] BinaryName = "${runc_path}" Root = "" - [plugins.cri.containerd.runtimes.kata] - runtime_type = "io.containerd.kata.v2" + [plugins.cri.containerd.runtimes.kata-${KATA_HYPERVISOR}] + runtime_type = "io.containerd.kata-${KATA_HYPERVISOR}.v2" privileged_without_host_devices = true EOF } @@ -127,7 +127,7 @@ function setup() { function run_test() { sudo -E crictl --timeout=20s pull "${IMAGE}" - pod=$(sudo -E crictl --timeout=20s runp -r kata $dir_path/nydus-sandbox.yaml) + pod=$(sudo -E crictl --timeout=20s runp -r kata-${KATA_HYPERVISOR} $dir_path/nydus-sandbox.yaml) echo "Pod $pod created" cnt=$(sudo -E crictl --timeout=20s create $pod $dir_path/nydus-container.yaml $dir_path/nydus-sandbox.yaml) echo "Container $cnt created"