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.
This commit is contained in:
Felix Fontein 2025-01-14 21:17:05 +01:00 committed by GitHub
parent 993d66971d
commit 9e26c4794e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 5 deletions

View File

@ -121,7 +121,7 @@
- present_2.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_2.warnings | default([]) | select('regex', ' Please report this at ') | length == 0
- present_3_check is changed - present_3_check is changed
- present_3_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_3_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0
- ((present_3 is changed) if docker_compose_version is version('2.31.0', '>=') else (present_3 is not changed)) - ((present_3 is changed) if docker_compose_version is version('2.31.0', '>=') and docker_compose_version is version('2.32.2', '<') else (present_3 is not changed))
- present_3.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_3.warnings | default([]) | select('regex', ' Please report this at ') | length == 0
- present_4_check is changed - present_4_check is changed
- present_4_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0 - present_4_check.warnings | default([]) | select('regex', ' Please report this at ') | length == 0

View File

@ -9,12 +9,10 @@
non_existing_image: does-not-exist:latest non_existing_image: does-not-exist:latest
project_src: "{{ remote_tmp_dir }}/{{ pname }}" project_src: "{{ remote_tmp_dir }}/{{ pname }}"
test_service_non_existing: | test_service_non_existing: |
version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: {{ non_existing_image }} image: {{ non_existing_image }}
test_service_simple: | test_service_simple: |
version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: {{ docker_test_image_simple_1 }} image: {{ docker_test_image_simple_1 }}

View File

@ -8,14 +8,12 @@
cname: "{{ name_prefix }}-container" cname: "{{ name_prefix }}-container"
project_src: "{{ remote_tmp_dir }}/{{ pname }}" project_src: "{{ remote_tmp_dir }}/{{ pname }}"
test_service: | test_service: |
version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: "{{ docker_test_image_alpine }}" image: "{{ docker_test_image_alpine }}"
command: '/bin/sh -c "sleep 10m"' command: '/bin/sh -c "sleep 10m"'
stop_grace_period: 1s stop_grace_period: 1s
test_service_mod: | test_service_mod: |
version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: "{{ docker_test_image_alpine }}" image: "{{ docker_test_image_alpine }}"