From f6d4cad46e1b32053c3bf10664fa8c0f250a5932 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 7 Jul 2022 22:54:14 +0200 Subject: [PATCH] Fix tests on Ubuntu 22.04 (#419) * Try to fix tests on Ubuntu 22.04. * Let Ansible handle the apt repo install. --- tests/integration/targets/setup_docker/tasks/Debian.yml | 4 +++- tests/integration/targets/setup_docker/vars/Ubuntu-22.yml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/integration/targets/setup_docker/vars/Ubuntu-22.yml diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml index 2292dd55..c368bc12 100644 --- a/tests/integration/targets/setup_docker/tasks/Debian.yml +++ b/tests/integration/targets/setup_docker/tasks/Debian.yml @@ -14,7 +14,9 @@ shell: curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg >key && apt-key add key - name: Add Docker repo - shell: add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable" + apt_repository: + repo: deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable + state: present - block: - name: Prevent service restart diff --git a/tests/integration/targets/setup_docker/vars/Ubuntu-22.yml b/tests/integration/targets/setup_docker/vars/Ubuntu-22.yml new file mode 100644 index 00000000..06f33c61 --- /dev/null +++ b/tests/integration/targets/setup_docker/vars/Ubuntu-22.yml @@ -0,0 +1,4 @@ +--- +docker_prereq_packages: + - ca-certificates + - curl