From e10468dd93039063b6fb9dc7b87ced1037a77675 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 14 Jan 2025 21:17:05 +0100 Subject: [PATCH] docker_compose_v2: fix tests (#1027) * Since docker-compose 2.32.2 present_3 is no longer changed. This has been caused by https://github.com/docker/compose/pull/12442, since that PR removes the "building" event. * Remove deprecated 'version' fields. (cherry picked from commit 9e26c4794e867ed7ca077febebfcdddb1d9e0561) --- .../integration/targets/docker_compose_v2/tasks/tests/pull.yml | 2 -- .../targets/docker_compose_v2/tasks/tests/start-stop.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml index babd12ab..9d0aa78a 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml @@ -9,12 +9,10 @@ non_existing_image: does-not-exist:latest project_src: "{{ remote_tmp_dir }}/{{ pname }}" test_service_non_existing: | - version: '3' services: {{ cname }}: image: {{ non_existing_image }} test_service_simple: | - version: '3' services: {{ cname }}: image: {{ docker_test_image_simple_1 }} diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml index 0af4a4ad..208bc404 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml @@ -8,14 +8,12 @@ cname: "{{ name_prefix }}-container" project_src: "{{ remote_tmp_dir }}/{{ pname }}" test_service: | - version: '3' services: {{ cname }}: image: "{{ docker_test_image_alpine }}" command: '/bin/sh -c "sleep 10m"' stop_grace_period: 1s test_service_mod: | - version: '3' services: {{ cname }}: image: "{{ docker_test_image_alpine }}"