From fde22d6bce4ab599ab57117dae947328cd0d5090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sat, 15 Jul 2023 00:45:04 +0200 Subject: [PATCH] ci: cri-containerd: Assume podman is always used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For this set of tests, we'll always be using podman in order to avoid having containerd pulled in by docker. Signed-off-by: Fabiano Fidêncio --- tests/integration/cri-containerd/integration-tests.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 7b2159039d..52ad61b57a 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -139,9 +139,6 @@ check_daemon_setup() { info "containerd(cri): Check daemon works with runc" create_containerd_config "runc" - #restart docker service as TestImageLoad depends on it - [ -z "${USE_PODMAN:-}" ] && restart_docker_service - # containerd cri-integration will modify the passed in config file. Let's # give it a temp one. cp $CONTAINERD_CONFIG_FILE $CONTAINERD_CONFIG_FILE_TEMP