From fe941a4045861bfe87340381e7992bcecdbc0291 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Wed, 20 May 2020 17:34:13 -0400 Subject: [PATCH] Pin Docker version at 19.03.1 --- .../targets/incidental_setup_docker/tasks/Suse.yml | 2 +- .../targets/incidental_setup_docker/vars/Debian.yml | 4 ++++ .../targets/incidental_setup_docker/vars/Fedora.yml | 3 ++- .../targets/incidental_setup_docker/vars/RedHat-7.yml | 4 ++++ .../integration/targets/incidental_setup_docker/vars/Suse.yml | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/test/integration/targets/incidental_setup_docker/tasks/Suse.yml b/test/integration/targets/incidental_setup_docker/tasks/Suse.yml index 81831941493..93f4d34e371 100644 --- a/test/integration/targets/incidental_setup_docker/tasks/Suse.yml +++ b/test/integration/targets/incidental_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/incidental_setup_docker/vars/Debian.yml b/test/integration/targets/incidental_setup_docker/vars/Debian.yml index e9ffb941596..477bd124321 100644 --- a/test/integration/targets/incidental_setup_docker/vars/Debian.yml +++ b/test/integration/targets/incidental_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/incidental_setup_docker/vars/Fedora.yml b/test/integration/targets/incidental_setup_docker/vars/Fedora.yml index 43126881035..9dd84344c4c 100644 --- a/test/integration/targets/incidental_setup_docker/vars/Fedora.yml +++ b/test/integration/targets/incidental_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/incidental_setup_docker/vars/RedHat-7.yml b/test/integration/targets/incidental_setup_docker/vars/RedHat-7.yml index 7166b1f5735..bc1c7820906 100644 --- a/test/integration/targets/incidental_setup_docker/vars/RedHat-7.yml +++ b/test/integration/targets/incidental_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/incidental_setup_docker/vars/Suse.yml b/test/integration/targets/incidental_setup_docker/vars/Suse.yml index ad0d515e2b7..b740861f34b 100644 --- a/test/integration/targets/incidental_setup_docker/vars/Suse.yml +++ b/test/integration/targets/incidental_setup_docker/vars/Suse.yml @@ -1,2 +1,2 @@ docker_packages: - - docker>=17 + - docker=19.03.1_ce