diff options
| author | Sam Doran <sdoran@redhat.com> | 2020-05-27 14:34:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 11:34:22 -0700 |
| commit | 02561e1f731974f52d06fba5f4debf55f3e0ee08 (patch) | |
| tree | 5afc0b577577d5ba7f181896ed07c307dce3fb21 | |
| parent | bcea0800be209845cb1d28bf60e36c7bc0c9b0ac (diff) | |
| download | ansible-02561e1f731974f52d06fba5f4debf55f3e0ee08.tar.gz | |
[stable-2.7] Pin Docker version at 19.03.1 (#69635) (#69647)
* [stable-2.7] Pin Docker version at 19.03.1.
(cherry picked from commit fe941a4045861bfe87340381e7992bcecdbc0291)
Co-authored-by: Sam Doran <sdoran@redhat.com>
* [stable-2.7] Pin docker-ce-cli version in tests (#69620)
Installing docker-ce has a dependency of docker-ce-cli. If the version of docker-ci-cli is not specified, it installs the latest version.
(cherry picked from commit 889da811d7fdc4c0fdab6ff573f7bc66b60b753c)
6 files changed, 13 insertions, 3 deletions
diff --git a/test/integration/targets/setup_docker/tasks/Suse.yml b/test/integration/targets/setup_docker/tasks/Suse.yml index bc4bd4f187..7b5c15e24a 100644 --- a/test/integration/targets/setup_docker/tasks/Suse.yml +++ b/test/integration/targets/setup_docker/tasks/Suse.yml @@ -1,4 +1,4 @@ -- name: Install docker 17 +- name: Install docker zypper: name: "{{ docker_packages }}" force: yes diff --git a/test/integration/targets/setup_docker/vars/Debian.yml b/test/integration/targets/setup_docker/vars/Debian.yml index e9ffb94159..477bd12432 100644 --- a/test/integration/targets/setup_docker/vars/Debian.yml +++ b/test/integration/targets/setup_docker/vars/Debian.yml @@ -1,3 +1,7 @@ +docker_packages: + - docker-ce=5:19.03.0* + - docker-ce-cli=5:19.03.0* + docker_prereq_packages: - apt-transport-https - ca-certificates diff --git a/test/integration/targets/setup_docker/vars/Fedora.yml b/test/integration/targets/setup_docker/vars/Fedora.yml index be83c6be1f..a783917c29 100644 --- a/test/integration/targets/setup_docker/vars/Fedora.yml +++ b/test/integration/targets/setup_docker/vars/Fedora.yml @@ -2,4 +2,5 @@ docker_prereq_packages: - dnf-plugins-core docker_packages: - - docker-ce + - docker-ce-19.03.1 + - docker-ce-cli-19.03.1 diff --git a/test/integration/targets/setup_docker/vars/RedHat-7.yml b/test/integration/targets/setup_docker/vars/RedHat-7.yml index 7166b1f573..bc1c782090 100644 --- a/test/integration/targets/setup_docker/vars/RedHat-7.yml +++ b/test/integration/targets/setup_docker/vars/RedHat-7.yml @@ -4,5 +4,9 @@ docker_prereq_packages: - lvm2 - libseccomp +docker_packages: + - docker-ce-19.03.1 + - docker-ce-cli-19.03.1 + docker_pip_extra_packages: - requests==2.6.0 diff --git a/test/integration/targets/setup_docker/vars/RedHat-8.yml b/test/integration/targets/setup_docker/vars/RedHat-8.yml index 45e50102bf..06d3f0d91a 100644 --- a/test/integration/targets/setup_docker/vars/RedHat-8.yml +++ b/test/integration/targets/setup_docker/vars/RedHat-8.yml @@ -7,3 +7,4 @@ docker_prereq_packages: # 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 diff --git a/test/integration/targets/setup_docker/vars/Suse.yml b/test/integration/targets/setup_docker/vars/Suse.yml index ad0d515e2b..b740861f34 100644 --- a/test/integration/targets/setup_docker/vars/Suse.yml +++ b/test/integration/targets/setup_docker/vars/Suse.yml @@ -1,2 +1,2 @@ docker_packages: - - docker>=17 + - docker=19.03.1_ce |