ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 20:08:41 +00:00
Code Packages Projects Releases Wiki Activity

CI: use new container images for Compose v2 pull tests (#900)

Browse Source 
* Use simple-1 image instead of Alpine image for docker_compose_v2_pull tests.

* Use simple-1 image instead of Alpine image for docker_compose_v2 pull tests.
This commit is contained in:
Felix Fontein 2024-06-29 11:43:00 +02:00 committed by GitHub
parent 37c639f6e8
commit 7efc6381d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml
View File

@ -13,12 +13,12 @@
services: services:
{{ cname }}: {{ cname }}:
image: {{ non_existing_image }} image: {{ non_existing_image }}
test_service_alpine: | test_service_simple: |
version: '3' version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: {{ docker_test_image_alpine }} image: {{ docker_test_image_simple_1 }}
command: /bin/sh -c 'sleep 10m' command: 10m
stop_grace_period: 1s stop_grace_period: 1s
block: block:
@ -37,7 +37,7 @@
name: '{{ item }}' name: '{{ item }}'
loop: loop:
- '{{ non_existing_image }}' - '{{ non_existing_image }}'
- '{{ docker_test_image_alpine }}' - '{{ docker_test_image_simple_1 }}'
#################################################################### ####################################################################
## Missing image ################################################### ## Missing image ###################################################
@ -95,10 +95,10 @@
## Regular image ################################################### ## Regular image ###################################################
#################################################################### ####################################################################
- name: Template project file with Alpine image - name: Template project file with simple image
copy: copy:
dest: '{{ project_src }}/docker-compose.yml' dest: '{{ project_src }}/docker-compose.yml'
content: '{{ test_service_alpine }}' content: '{{ test_service_simple }}'
- name: Present with pull=missing (check) - name: Present with pull=missing (check)
docker_compose_v2: docker_compose_v2:

14
tests/integration/targets/docker_compose_v2_pull/tasks/tests/pull.yml
View File

@ -13,12 +13,12 @@
services: services:
{{ cname }}: {{ cname }}:
image: {{ non_existing_image }} image: {{ non_existing_image }}
test_service_alpine: | test_service_simple: |
version: '3' version: '3'
services: services:
{{ cname }}: {{ cname }}:
image: {{ docker_test_image_alpine }} image: {{ docker_test_image_simple_1 }}
command: /bin/sh -c 'sleep 10m' command: 10m
stop_grace_period: 1s stop_grace_period: 1s
block: block:
@ -37,7 +37,7 @@
name: '{{ item }}' name: '{{ item }}'
loop: loop:
- '{{ non_existing_image }}' - '{{ non_existing_image }}'
- '{{ docker_test_image_alpine }}' - '{{ docker_test_image_simple_1 }}'
#################################################################### ####################################################################
## Missing image ################################################### ## Missing image ###################################################
@ -72,10 +72,10 @@
## Regular image ################################################### ## Regular image ###################################################
#################################################################### ####################################################################
- name: Template project file with Alpine image - name: Template project file with simple image
copy: copy:
dest: '{{ project_src }}/docker-compose.yml' dest: '{{ project_src }}/docker-compose.yml'
content: '{{ test_service_alpine }}' content: '{{ test_service_simple }}'
- when: docker_compose_version is version('2.22.0', '>=') - when: docker_compose_version is version('2.22.0', '>=')
block: block:
@ -107,7 +107,7 @@
- name: Make sure image is not around - name: Make sure image is not around
docker_image_remove: docker_image_remove:
name: '{{ docker_test_image_alpine }}' name: '{{ docker_test_image_simple_1 }}'
- name: Pull with policy=always (check) - name: Pull with policy=always (check)
docker_compose_v2_pull: docker_compose_v2_pull:

2
tests/integration/targets/setup_docker/vars/main.yml
View File

@ -17,3 +17,5 @@ docker_test_image_alpine: quay.io/ansible/docker-test-containers:alpine3.8
docker_test_image_alpine_different: quay.io/ansible/docker-test-containers:alpine3.7 docker_test_image_alpine_different: quay.io/ansible/docker-test-containers:alpine3.7
docker_test_image_registry_nginx: quay.io/ansible/docker-test-containers:nginx-alpine docker_test_image_registry_nginx: quay.io/ansible/docker-test-containers:nginx-alpine
docker_test_image_registry: registry:2.6.1 docker_test_image_registry: registry:2.6.1
docker_test_image_simple_1: ghcr.io/ansible-collections/simple-1:tag
docker_test_image_simple_2: ghcr.io/ansible-collections/simple-2:tag