diff options
| author | Felix Fontein <felix@fontein.de> | 2018-11-19 11:01:40 +0100 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-11-19 11:52:03 -0800 |
| commit | a96efa43f0f002beaf2786db5e2b3fbc4e27fa42 (patch) | |
| tree | 0ec21db89873a84f2625a069196afc63acf0c4ff /test/integration/targets/docker_container | |
| parent | 1469ec448771a299fce9aefd877e3190a2bed91a (diff) | |
| download | ansible-a96efa43f0f002beaf2786db5e2b3fbc4e27fa42.tar.gz | |
docker_* tests: check API version (#48620)
* Check minimal API and docker-py versions for all docker_* tests.
* Improve docker_swarm creation/destruction for tests.
* Fail when conditions aren't met.
* Don't hardcode address for advertise_addr.
(cherry picked from commit 3bb41ccb8e57f059ca1f3d641195c523f5cd23d4)
Diffstat (limited to 'test/integration/targets/docker_container')
| -rw-r--r-- | test/integration/targets/docker_container/tasks/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/integration/targets/docker_container/tasks/main.yml b/test/integration/targets/docker_container/tasks/main.yml index 3c958b17d6..7e4ba70fd4 100644 --- a/test/integration/targets/docker_container/tasks/main.yml +++ b/test/integration/targets/docker_container/tasks/main.yml @@ -31,3 +31,6 @@ when: docker_py_version is version('1.10.0', '>=') when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=') + +- fail: msg="Too old docker / docker-py version to run all docker_container tests!" + when: not(docker_py_version is version('3.5.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) |