diff options
| author | Sam Doran <sdoran@redhat.com> | 2019-07-03 14:24:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 14:24:24 -0400 |
| commit | d50c8c2b83e4ccf9b0bf4bdc4f26ebd2346df255 (patch) | |
| tree | 03a2132b19e80af23d0c96564dc1d0a3ab3d021d /test/integration/targets/setup_docker/tasks/Debian.yml | |
| parent | ce79c8eb272b544ff0940bb392570fce016672dd (diff) | |
| download | ansible-d50c8c2b83e4ccf9b0bf4bdc4f26ebd2346df255.tar.gz | |
Improve setup_docker tests to work with RHEL 8 GA (#58649)
- use include_vars to set appropriate packages and pip packages per distribution and version
- install an older version of Docker CE on RHEL 8 since a dependency is unavailable
- disable warnings on tasks that are ok
- skip tests for CentOS/RHEL 6
Diffstat (limited to 'test/integration/targets/setup_docker/tasks/Debian.yml')
| -rw-r--r-- | test/integration/targets/setup_docker/tasks/Debian.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/integration/targets/setup_docker/tasks/Debian.yml b/test/integration/targets/setup_docker/tasks/Debian.yml index 4564eee49a..da81ac77b3 100644 --- a/test/integration/targets/setup_docker/tasks/Debian.yml +++ b/test/integration/targets/setup_docker/tasks/Debian.yml @@ -4,20 +4,15 @@ - name: Install pre-reqs apt: - name: "{{ item }}" + name: "{{ docker_prereq_packages }}" state: present update_cache: yes - with_items: - - apt-transport-https - - ca-certificates - - curl - - software-properties-common - name: Add gpg key shell: curl -fsSL https://download.docker.com/linux/ubuntu/gpg >key && apt-key add key - name: Add Docker repo - shell: add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + shell: add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - block: - name: Prevent service restart @@ -30,7 +25,7 @@ - name: Install Docker CE apt: - name: docker-ce + name: "{{ docker_packages }}" state: present update_cache: yes always: |