From a24718cf807a29335fc08c4d7974851a128b42b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 20 Jun 2024 23:01:59 +0200 Subject: [PATCH] ci: Prefer distro packaged containerd for Ubuntu >20.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's switch the logic, and ensure that 24.04 also installs containerd from the distro. Signed-off-by: Fabiano Fidêncio --- tests/e2e/ansible/install_containerd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/ansible/install_containerd.yaml b/tests/e2e/ansible/install_containerd.yaml index 4f6d1021..5ea9ee1b 100644 --- a/tests/e2e/ansible/install_containerd.yaml +++ b/tests/e2e/ansible/install_containerd.yaml @@ -11,7 +11,7 @@ tasks: - name: Install containerd from distro package: - name: "{{ 'containerd.io' if ansible_distribution_version != '22.04' else 'containerd' }}" + name: "{{ 'containerd.io' if ansible_distribution_version == '20.04' else 'containerd' }}" state: present # The docker package overwrite the /etc/containerd/config.toml installed # by the containerd.io package. As a result we are hit by the following