[stable-2.9] Pin Docker version at 19.03.1 (#69635) (#69645)

* [stable-2.9] Pin Docker version at 19.03.1 (cherry picked from commit fe941a4) Co-authored-by: Sam Doran <sdoran@redhat.com> * [stable-2.9] 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 889da81)
ansible · May 21, 2020 · f963aba · f963aba
1 parent 7adce02
commit f963aba
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,5 @@
 docker_prereq_packages: []
 
 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
@@ -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
@@ -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
@@ -1,2 +1,2 @@
 docker_packages:
-  - docker>=17
+  - docker=19.03.1_ce