From 8064209b0dd82834e2de9152b870a9c94c7945ef Mon Sep 17 00:00:00 2001 From: Tristan Pourcelot Date: Sat, 2 Aug 2025 15:21:42 +0200 Subject: [PATCH] chore(docker_swarm_plugin): Fixes after review --- plugins/modules/docker_swarm_service.py | 1 + .../docker_swarm_service/tasks/tests/options.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/modules/docker_swarm_service.py b/plugins/modules/docker_swarm_service.py index cfbaacb5..8e14f4ad 100644 --- a/plugins/modules/docker_swarm_service.py +++ b/plugins/modules/docker_swarm_service.py @@ -237,6 +237,7 @@ options: - Service replication mode. - Service will be removed and recreated when changed. - Corresponds to the C(--mode) option of C(docker service create). + - The value V(replicated-job) was added in community.docker 4.7.0 and requires API version >= 1.41. type: str default: replicated choices: diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml index 7472ac96..2a831fa9 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml @@ -1301,13 +1301,7 @@ replicas: 1 register: mode_3 -- name: cleanup - docker_swarm_service: - name: "{{ service_name }}" - state: absent - diff: false - -- name: mode +- name: mode (change) docker_swarm_service: name: "{{ service_name }}" image: "{{ docker_test_image_alpine }}" @@ -1316,6 +1310,7 @@ mode: "replicated-job" replicas: 1 register: mode_4 + ignore_errors: true - name: mode (idempotency) docker_swarm_service: @@ -1326,6 +1321,7 @@ mode: "replicated-job" replicas: 1 register: mode_5 + ignore_errors: true - name: mode (change) docker_swarm_service: @@ -1343,15 +1339,19 @@ state: absent diff: false - - assert: that: - mode_1 is changed - mode_2 is not changed - mode_3 is changed + +- assert: + that: - mode_4 is changed - mode_5 is not changed - mode_6 is changed + when: docker_api_version is version('1.41', '>=') and docker_py_version is version('6.0.0', '>=') + #################################################################### ## stop_grace_period ###############################################