From aa7d391a4f7268a43f875f9e1c0893b5303aa0dd Mon Sep 17 00:00:00 2001 From: Bin Liu Date: Thu, 22 Dec 2022 16:40:01 +0800 Subject: [PATCH] tests: Explicitly set the containerd config file version containerd config version 1 has been deprecated and will be removed in containerd v2.0 Fixes: #5352 Signed-off-by: Bin Liu --- .ci/configure_containerd_for_kata.sh | 1 + integration/containerd/cri/integration-tests.sh | 1 + integration/nydus/nydus_tests.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/.ci/configure_containerd_for_kata.sh b/.ci/configure_containerd_for_kata.sh index 4eb2bd0dd..841b5b27b 100755 --- a/.ci/configure_containerd_for_kata.sh +++ b/.ci/configure_containerd_for_kata.sh @@ -14,6 +14,7 @@ readonly runc_path=$(command -v runc) sudo mkdir -p /etc/containerd/ cat << EOF | sudo tee /etc/containerd/config.toml +version = 2 [debug] level = "debug" [plugins] diff --git a/integration/containerd/cri/integration-tests.sh b/integration/containerd/cri/integration-tests.sh index b2e4cc28e..1714e1100 100755 --- a/integration/containerd/cri/integration-tests.sh +++ b/integration/containerd/cri/integration-tests.sh @@ -119,6 +119,7 @@ create_containerd_config() { runtime="${runtime//./-}" cat << EOF | sudo tee "${CONTAINERD_CONFIG_FILE}" +version = 2 [debug] level = "debug" [plugins] diff --git a/integration/nydus/nydus_tests.sh b/integration/nydus/nydus_tests.sh index a7cd786ed..5fecf5afe 100755 --- a/integration/nydus/nydus_tests.sh +++ b/integration/nydus/nydus_tests.sh @@ -118,6 +118,7 @@ function config_containerd() { fi cat <