diff --git a/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml b/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml index e35b2c74565..bd7083157fc 100644 --- a/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml @@ -17,10 +17,14 @@ args: warn: no -- name: Add repository - command: yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - args: - warn: no +# They broke their .repo file, so we set it up ourselves +- name: Set-up repository + yum_repository: + name: docker-ce + description: docker-ce + baseurl: https://download.docker.com/linux/centos/{{ ansible_facts.distribution_major_version }}/$basearch/stable + gpgcheck: true + gpgkey: https://download.docker.com/linux/centos/gpg - name: Update cache command: yum -y makecache fast diff --git a/test/integration/targets/incidental_setup_docker/tasks/RedHat-8.yml b/test/integration/targets/incidental_setup_docker/tasks/RedHat-8.yml index 63bf2a42af3..6d2fb3e7586 100644 --- a/test/integration/targets/incidental_setup_docker/tasks/RedHat-8.yml +++ b/test/integration/targets/incidental_setup_docker/tasks/RedHat-8.yml @@ -11,10 +11,14 @@ retries: 10 delay: 2 +# They broke their .repo file, so we set it up ourselves - name: Set-up repository - command: dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - args: - warn: no + yum_repository: + name: docker-ce + description: docker-ce + baseurl: https://download.docker.com/linux/centos/{{ ansible_facts.distribution_major_version }}/$basearch/stable + gpgcheck: true + gpgkey: https://download.docker.com/linux/centos/gpg - name: Install docker dnf: diff --git a/test/integration/targets/incidental_setup_docker/vars/RedHat-8.yml b/test/integration/targets/incidental_setup_docker/vars/RedHat-8.yml index e8cb9edfd87..ff6dcf7b7b0 100644 --- a/test/integration/targets/incidental_setup_docker/vars/RedHat-8.yml +++ b/test/integration/targets/incidental_setup_docker/vars/RedHat-8.yml @@ -4,7 +4,6 @@ docker_prereq_packages: - lvm2 - libseccomp -# Docker CE > 3:18.09.1 requires containerd.io >= 1.2.2-3 which is unavaible at this time docker_packages: - - docker-ce-3:18.09.1 - - docker-ce-cli-1:18.09.1 + - docker-ce-19.03.13 + - docker-ce-cli-19.03.13