From e9d6179b2839b5d0be6f33ec6c621cdc54cbdd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Mon, 8 Jul 2024 18:47:07 +0000 Subject: [PATCH] tests: cri-containerd: Ensure Docker isn't present MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following #9960 that transitioned this test to a free runner, we need to ensure Docker isn't installed on the system as that will conflict with the installation of Podman. Example error: https://github.com/kata-containers/kata-containers/actions/runs/9818218975/job/27177785716 Signed-off-by: Aurélien Bombo --- tests/integration/cri-containerd/gha-run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/cri-containerd/gha-run.sh b/tests/integration/cri-containerd/gha-run.sh index bddadc8973..9033b0e4f3 100755 --- a/tests/integration/cri-containerd/gha-run.sh +++ b/tests/integration/cri-containerd/gha-run.sh @@ -16,6 +16,9 @@ source "${cri_containerd_dir}/../../common.bash" function install_dependencies() { info "Installing the dependencies needed for running the cri-containerd tests" + # Remove Docker if it's installed as it conflicts with podman-docker + sudo apt-get remove -y docker-ce-cli || true + # Dependency list of projects that we can rely on the system packages # - build-essential # - Theoretically we only need `make`, but doesn't hurt to install