Commit Graph

2 Commits (f8a5377cc6233e12c57770bd2efbc00ab7212429)

Author SHA1 Message Date
Sam Doran f5fa6ace4a [stable-2.9] Make Docker and Podman play nice (#65009) (#65015)
podman 1.4 now installs docker man pages. Add handler to remove docker packages to avoid test failure due to this conflict.

Adjust inventory_docker_swarm integration test
Add conditional to cleanup handlers to allow use of the setup_docker role without removing packages at the end of the play. The inventory_docker_swarm integration tests does its own cleanup..
(cherry picked from commit 6b2b876d43)

Co-authored-by: Sam Doran <sdoran@redhat.com>
5 years ago
Sam Doran d50c8c2b83
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
6 years ago