mirror of
https://github.com/ansible-collections/community.docker.git
synced 2026-07-29 11:55:04 +00:00
Implement all remaining deprecations for 3.0.0 (#400)
* Remove support for Ansible 2.9 and ansible-base 2.10. * Remove Ansible 2.9 compatiblity code. * Remove docker-compose from EE. * Drop support for Python 2.6. Stop advertising docker-py for Python 2.6. * Drop support for API versions 1.20 to 1.24. * Fix condition.
This commit is contained in:
Felix Fontein
GitHub
+1
-1
@@ -2,4 +2,4 @@
|
||||
# See template for more information:
|
||||
# https://github.com/ansible/ansible/blob/devel/test/lib/ansible_test/config/config.yml
|
||||
modules:
|
||||
python_requires: default
|
||||
python_requires: '>= 2.7'
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
---
|
||||
# Create random name prefix (for containers, networks, ...)
|
||||
- name: Create random container name prefix
|
||||
set_fact:
|
||||
cname_prefix: "{{ 'ansible-docker-test-%0x' % ((2**32) | random) }}"
|
||||
|
||||
- name: Create project and container names
|
||||
set_fact:
|
||||
pname: "{{ cname_prefix }}"
|
||||
cname: "{{ cname_prefix }}-hi"
|
||||
|
||||
- name: Define service
|
||||
set_fact:
|
||||
test_service: |
|
||||
version: '3'
|
||||
services:
|
||||
{{ cname }}:
|
||||
image: "{{ docker_test_image_alpine }}"
|
||||
command: '/bin/sh -c "sleep 10m"'
|
||||
stop_grace_period: 1s
|
||||
|
||||
- name: Present
|
||||
community.docker.docker_compose:
|
||||
project_name: "{{ pname }}"
|
||||
state: present
|
||||
remove_orphans: true
|
||||
definition: "{{ test_service | from_yaml }}"
|
||||
|
||||
- name: Absent
|
||||
community.docker.docker_compose:
|
||||
project_name: "{{ pname }}"
|
||||
state: absent
|
||||
remove_orphans: true
|
||||
definition: "{{ test_service | from_yaml }}"
|
||||
@@ -37,7 +37,7 @@
|
||||
when: docker_py_version is version('1.10.0', '>=')
|
||||
diff: no
|
||||
|
||||
when: has_docker_compose and docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: has_docker_compose and docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run all docker_container tests!"
|
||||
when: has_docker_compose and 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)
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
when: docker_py_version is version('1.10.0', '>=')
|
||||
diff: no
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- 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)
|
||||
|
||||
@@ -190,7 +190,7 @@
|
||||
- "'stderr' not in result"
|
||||
- result.exec_id is string
|
||||
|
||||
- when: docker_py_version is version('2.3.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
- when: docker_py_version is version('2.3.0', '>=')
|
||||
block:
|
||||
- name: Execute in a present container (environment variable)
|
||||
docker_container_exec:
|
||||
@@ -220,7 +220,7 @@
|
||||
state: absent
|
||||
force_kill: yes
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_container_exec tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
state: absent
|
||||
force_kill: yes
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_container_info tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
####################################################################
|
||||
|
||||
- include_tasks: test_host_info.yml
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.21', '>=')
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_host_info tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.21', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
force_kill: yes
|
||||
with_items: "{{ cnames }}"
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_image tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -289,20 +289,12 @@
|
||||
register: load_image_3
|
||||
ignore_errors: true
|
||||
|
||||
- name: load image (invalid image, old API version)
|
||||
docker_image:
|
||||
name: foo:bar
|
||||
load_path: "{{ remote_tmp_dir }}/image-invalid.tar"
|
||||
source: load
|
||||
api_version: "1.22"
|
||||
register: load_image_4
|
||||
|
||||
- name: load image (ID, idempotency)
|
||||
docker_image:
|
||||
name: "{{ archive_image.image.Id }}"
|
||||
load_path: "{{ remote_tmp_dir }}/image_id.tar"
|
||||
source: load
|
||||
register: load_image_5
|
||||
register: load_image_4
|
||||
|
||||
- assert:
|
||||
that:
|
||||
@@ -314,9 +306,7 @@
|
||||
"The archive did not contain image 'foo:bar'. Instead, found '" ~ docker_test_image_hello_world ~ "'." == load_image_2.msg
|
||||
- load_image_3 is failed
|
||||
- '"Detected no loaded images. Archive potentially corrupt?" == load_image_3.msg'
|
||||
- load_image_4 is changed
|
||||
- "'The API version of your Docker daemon is < 1.23, which does not return the image loading result from the Docker daemon. Therefore, we cannot verify whether the expected image was loaded, whether multiple images where loaded, or whether the load actually succeeded. You should consider upgrading your Docker daemon.' in load_image_4.warnings"
|
||||
- load_image_5 is not changed
|
||||
- load_image_4 is not changed
|
||||
|
||||
####################################################################
|
||||
## build.path ######################################################
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
- "docker_test_image_hello_world in result.images[0].RepoTags"
|
||||
- "docker_test_image_alpine in result.images[1].RepoTags"
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_image_info tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
force_kill: yes
|
||||
with_items: "{{ cnames }}"
|
||||
|
||||
when: docker_py_version is version('2.5.0', '>=') and docker_api_version is version('1.23', '>=')
|
||||
when: docker_py_version is version('2.5.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_image tests!"
|
||||
when: not(docker_py_version is version('2.5.0', '>=') and docker_api_version is version('1.23', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('2.5.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
- include_tasks: run-test.yml
|
||||
with_fileglob:
|
||||
- "tests/*.yml"
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_image tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
force: yes
|
||||
loop: "{{ dnetworks }}"
|
||||
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=') # FIXME: find out API version!
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_network tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
force: yes
|
||||
|
||||
# Requirements for docker_swarm
|
||||
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', '>=')
|
||||
|
||||
####################################################################
|
||||
## attachable ######################################################
|
||||
|
||||
@@ -56,6 +56,3 @@
|
||||
docker_swarm:
|
||||
state: absent
|
||||
force: yes
|
||||
|
||||
# Requirements for docker_swarm
|
||||
when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
- "'is too new. Maximum supported API version is' in docker_inspect.stderr"
|
||||
when: docker_inspect is failed
|
||||
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.21', '>=')
|
||||
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_network_info tests!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.21', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
####################################################################
|
||||
|
||||
- include_tasks: test_node_info.yml
|
||||
# Maximum of 1.24 (docker API version for docker_node_info) and 1.25 (docker API version for docker_swarm) is 1.25
|
||||
when: docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_node_info tests!"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
state: absent
|
||||
with_items: "{{ plugin_names }}"
|
||||
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_plugin tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
####################################################################
|
||||
|
||||
- include_tasks: test_swarm_info.yml
|
||||
# Maximum of 1.24 (docker API version for docker_swarm_info) and 1.25 (docker API version for docker_swarm) is 1.25
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_info tests!"
|
||||
|
||||
@@ -73,7 +73,6 @@
|
||||
state: absent
|
||||
force: yes
|
||||
ignore_errors: yes
|
||||
# Maximum of 1.24 (docker API version for docker_swarm_service) and 1.25 (docker API version for docker_swarm) is 1.25
|
||||
when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!"
|
||||
|
||||
@@ -110,4 +110,4 @@
|
||||
that:
|
||||
- output is success
|
||||
- output is changed
|
||||
when: docker_api_version is version('1.24', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
|
||||
@@ -319,12 +319,12 @@
|
||||
- dns_4 is changed
|
||||
- dns_5 is changed
|
||||
- dns_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_1 is failed
|
||||
- "'Minimum version required' in dns_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## dns_options #####################################################
|
||||
@@ -412,12 +412,12 @@
|
||||
- dns_options_4 is not changed
|
||||
- dns_options_5 is changed
|
||||
- dns_options_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_options_1 is failed
|
||||
- "'Minimum version required' in dns_options_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## dns_search ######################################################
|
||||
@@ -505,12 +505,12 @@
|
||||
- dns_search_4 is changed
|
||||
- dns_search_5 is changed
|
||||
- dns_search_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- dns_search_1 is failed
|
||||
- "'Minimum version required' in dns_search_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## endpoint_mode ###################################################
|
||||
@@ -557,12 +557,12 @@
|
||||
- endpoint_mode_1 is changed
|
||||
- endpoint_mode_2 is not changed
|
||||
- endpoint_mode_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_py_version is version('3.0.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- endpoint_mode_1 is failed
|
||||
- "'Minimum version required' in endpoint_mode_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('3.0.0', '<')
|
||||
when: docker_py_version is version('3.0.0', '<')
|
||||
|
||||
####################################################################
|
||||
## env #############################################################
|
||||
@@ -800,12 +800,12 @@
|
||||
that:
|
||||
- force_update_1 is changed
|
||||
- force_update_2 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- force_update_1 is failed
|
||||
- "'Minimum version required' in force_update_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
####################################################################
|
||||
## groups ##########################################################
|
||||
@@ -892,12 +892,12 @@
|
||||
- groups_4 is changed
|
||||
- groups_5 is changed
|
||||
- groups_6 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- groups_1 is failed
|
||||
- "'Minimum version required' in groups_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
####################################################################
|
||||
## healthcheck #####################################################
|
||||
@@ -1091,12 +1091,12 @@
|
||||
- hostname_1 is changed
|
||||
- hostname_2 is not changed
|
||||
- hostname_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.2.0', '>=')
|
||||
when: docker_py_version is version('2.2.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- hostname_1 is failed
|
||||
- "'Minimum version required' in hostname_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.2.0', '<')
|
||||
when: docker_py_version is version('2.2.0', '<')
|
||||
|
||||
###################################################################
|
||||
## hosts ##########################################################
|
||||
@@ -1148,12 +1148,12 @@
|
||||
- hosts_1 is changed
|
||||
- hosts_2 is not changed
|
||||
- hosts_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.6.0', '>=')
|
||||
when: docker_py_version is version('2.6.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- hosts_1 is failed
|
||||
- "'Minimum version required' in hosts_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.6.0', '<')
|
||||
when: docker_py_version is version('2.6.0', '<')
|
||||
|
||||
|
||||
###################################################################
|
||||
@@ -1587,12 +1587,12 @@
|
||||
- (publish_8_info.service.Endpoint.Ports | length) == 2
|
||||
- publish_9 is changed
|
||||
- publish_10 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('3.0.0', '>=')
|
||||
when: docker_py_version is version('3.0.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- publish_1 is failed
|
||||
- "'Minimum version required' in publish_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('3.0.0', '<')
|
||||
when: docker_py_version is version('3.0.0', '<')
|
||||
|
||||
###################################################################
|
||||
## read_only ######################################################
|
||||
@@ -1784,12 +1784,12 @@
|
||||
- tty_1 is changed
|
||||
- tty_2 is not changed
|
||||
- tty_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- tty_1 is failed
|
||||
- "'Minimum version required' in tty_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
###################################################################
|
||||
## user ###########################################################
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
data: "secret1"
|
||||
state: "present"
|
||||
register: "secret_result_1"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
- docker_secret:
|
||||
name: "{{ secret_name_2 }}"
|
||||
data: "secret2"
|
||||
state: "present"
|
||||
register: "secret_result_2"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
- docker_secret:
|
||||
name: "{{ secret_name_3 }}"
|
||||
@@ -31,7 +31,7 @@
|
||||
state: "present"
|
||||
rolling_versions: true
|
||||
register: "secret_result_3"
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
####################################################################
|
||||
## secrets #########################################################
|
||||
@@ -159,7 +159,7 @@
|
||||
state: "present"
|
||||
rolling_versions: true
|
||||
register: secrets_10
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
ignore_errors: yes
|
||||
|
||||
- name: rolling secrets service update
|
||||
@@ -193,12 +193,12 @@
|
||||
- secrets_9 is changed
|
||||
- secrets_10 is not failed
|
||||
- secrets_11 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (uid) ###################################################
|
||||
@@ -282,12 +282,12 @@
|
||||
- secrets_3 is changed
|
||||
- secrets_4 is changed
|
||||
- secrets_5 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (gid) ###################################################
|
||||
@@ -371,12 +371,12 @@
|
||||
- secrets_3 is changed
|
||||
- secrets_4 is changed
|
||||
- secrets_5 is not changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
## secrets (mode) ##################################################
|
||||
@@ -432,12 +432,12 @@
|
||||
- secrets_1 is changed
|
||||
- secrets_2 is not changed
|
||||
- secrets_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.4.0', '>=')
|
||||
when: docker_py_version is version('2.4.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- secrets_1 is failed
|
||||
- "'Minimum version required' in secrets_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.4.0', '<')
|
||||
when: docker_py_version is version('2.4.0', '<')
|
||||
|
||||
####################################################################
|
||||
####################################################################
|
||||
@@ -455,4 +455,4 @@
|
||||
loop_control:
|
||||
loop_var: secret_name
|
||||
ignore_errors: yes
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
|
||||
@@ -183,12 +183,12 @@
|
||||
- update_max_failure_ratio_1 is changed
|
||||
- update_max_failure_ratio_2 is not changed
|
||||
- update_max_failure_ratio_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- update_max_failure_ratio_1 is failed
|
||||
- "'Minimum version required' in update_max_failure_ratio_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
###################################################################
|
||||
# update_config.monitor ###########################################
|
||||
@@ -238,12 +238,12 @@
|
||||
- update_monitor_1 is changed
|
||||
- update_monitor_2 is not changed
|
||||
- update_monitor_3 is changed
|
||||
when: docker_api_version is version('1.25', '>=') and docker_py_version is version('2.1.0', '>=')
|
||||
when: docker_py_version is version('2.1.0', '>=')
|
||||
- assert:
|
||||
that:
|
||||
- update_monitor_1 is failed
|
||||
- "'Minimum version required' in update_monitor_1.msg"
|
||||
when: docker_api_version is version('1.25', '<') or docker_py_version is version('2.1.0', '<')
|
||||
when: docker_py_version is version('2.1.0', '<')
|
||||
|
||||
###################################################################
|
||||
# update_config.order #############################################
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
####################################################################
|
||||
|
||||
- include_tasks: test_docker_swarm_service_info.yml
|
||||
when: docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.24', '>=')
|
||||
when: docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_service_info tests!"
|
||||
when: not(docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.24', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
-1
@@ -76,7 +76,6 @@
|
||||
state: absent
|
||||
force: true
|
||||
|
||||
# Maximum of 1.24 (docker API version for docker_swarm_service_info) and 1.25 (docker API version for docker_swarm) is 1.25
|
||||
when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_swarm_service_info tests!"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
state: absent
|
||||
with_items: "{{ vnames }}"
|
||||
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=') # FIXME: find out API version!
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=') # FIXME: find out API version!
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_volume tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
when: docker_volume_inspect is failed
|
||||
|
||||
# Requirements for docker_volume
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.24', '>=')
|
||||
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to run docker_volume_info tests!"
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.24', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
msg: Using test registry name {{ docker_registry_container_name_registry }} and nginx frontend names {{ docker_registry_container_name_nginx }} and {{ docker_registry_container_name_nginx2 }}
|
||||
|
||||
- fail: msg="Too old docker / docker-py version to set up docker registry!"
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
|
||||
|
||||
- when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
|
||||
- when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.25', '>=')
|
||||
block:
|
||||
|
||||
# Set up registry container
|
||||
|
||||
Reference in New Issue
Block a user