diff options
| author | Rick Elrod <rick@elrod.me> | 2020-09-23 21:36:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 21:36:46 -0500 |
| commit | 4616b3bbac837c4d6e13da3191e04823d883bd96 (patch) | |
| tree | e99a45f98bfb61da1175b933d2770123d16c6174 | |
| parent | 8ceb36098d10910b83c72278663df8048aeadc5c (diff) | |
| download | ansible-4616b3bbac837c4d6e13da3191e04823d883bd96.tar.gz | |
[incidental_setup_docker] changes to upstream repo (#71897) (#71901)
Change:
- The docker-ce.repo file for centos does not work on RHEL since it uses
$releasever and on RHEL that is, e.g., "7Server".
- Instead, set up the repo manually.
- Additionally, the docker centos8 repo no longer has old versions, so
we use the (only) version in the repo instead.
Test Plan:
- CI
Signed-off-by: Rick Elrod <rick@elrod.me>
(cherry picked from commit 31ddca4c0db2584b0a68880bdea1d97bd8b22032)
(cherry picked from commit 651c0a2d03004f7d7151ad5539eff418d29463d7)
3 files changed, 17 insertions, 10 deletions
diff --git a/test/integration/targets/setup_docker/tasks/RedHat-7.yml b/test/integration/targets/setup_docker/tasks/RedHat-7.yml index 57d42264f7..b405ee79d0 100644 --- a/test/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/setup_docker/tasks/RedHat-7.yml @@ -16,10 +16,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/setup_docker/tasks/RedHat-8.yml b/test/integration/targets/setup_docker/tasks/RedHat-8.yml index d6a775c197..e2d951cce7 100644 --- a/test/integration/targets/setup_docker/tasks/RedHat-8.yml +++ b/test/integration/targets/setup_docker/tasks/RedHat-8.yml @@ -6,10 +6,14 @@ name: "{{ docker_prereq_packages }}" state: present +# 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/setup_docker/vars/RedHat-8.yml b/test/integration/targets/setup_docker/vars/RedHat-8.yml index 06d3f0d91a..4c802b628c 100644 --- a/test/integration/targets/setup_docker/vars/RedHat-8.yml +++ b/test/integration/targets/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 |