mirror of https://github.com/ansible/ansible.git
docker_swarm: fix minimal API version (#49691)
* Reduce minimally required docker API version to 1.25, with selective features requiring 1.30. * Adjust test requirements. * Forgot some imports.pull/49862/head
parent
b183eb4464
commit
495a426039
@ -1,7 +1,6 @@
|
|||||||
---
|
---
|
||||||
- include_tasks: test_docker_config.yml
|
- include_tasks: test_docker_config.yml
|
||||||
# Maximum of 1.30 (docker API version for docker_config) and 1.35 (docker API version for docker_swarm) is 1.35
|
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.30', '>=')
|
||||||
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')
|
|
||||||
|
|
||||||
- fail: msg="Too old docker / docker-py version to run docker_config tests!"
|
- fail: msg="Too old docker / docker-py version to run docker_config tests!"
|
||||||
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.30', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
- include_tasks: test_secrets.yml
|
- include_tasks: test_secrets.yml
|
||||||
# Maximum of 2.1.0 (docker-py version for docker_secrets) and 2.6.0 (docker-py version for docker_swarm) is 2.6.0
|
# Maximum of 2.1.0 (docker-py version for docker_secrets) and 2.6.0 (docker-py version for docker_swarm) is 2.6.0
|
||||||
# Maximum of 1.25 (docker API version for docker_secrets) and 1.35 (docker API version for docker_swarm) is 1.35
|
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||||
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')
|
|
||||||
|
|
||||||
- fail: msg="Too old docker / docker-py version to run docker_secrets tests!"
|
- fail: msg="Too old docker / docker-py version to run docker_secrets tests!"
|
||||||
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
- include_tasks: test_swarm.yml
|
- include_tasks: test_swarm.yml
|
||||||
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')
|
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||||
|
|
||||||
- fail: msg="Too old docker / docker-py version to run docker_swarm tests!"
|
- fail: msg="Too old docker / docker-py version to run docker_swarm tests!"
|
||||||
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
- include_tasks: test_swarm_service.yml
|
- include_tasks: test_swarm_service.yml
|
||||||
# Maximum of 2.0.0 (docker-py version for docker_swarm_service) and 2.6.0 (docker-py version for docker_swarm) is 2.6.0
|
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||||
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')
|
|
||||||
|
|
||||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!"
|
- fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!"
|
||||||
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.35', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||||
|
Loading…
Reference in New Issue