From 44a1dd33c2b271bc329f101b1a364bacb0985566 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 15 Nov 2025 22:02:28 +0100 Subject: [PATCH] Add more known image IDs. --- .../docker_image_pull/tasks/tests/image-ids.yml | 12 ++++-------- .../targets/docker_image_push/tasks/tests/basic.yml | 2 +- .../targets/docker_image_remove/tasks/main.yml | 10 ++++++---- tests/integration/targets/setup_docker/vars/main.yml | 12 +++++++++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml b/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml index b28f8989..59c3d180 100644 --- a/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml +++ b/tests/integration/targets/docker_image_pull/tasks/tests/image-ids.yml @@ -7,11 +7,9 @@ block: - name: Make sure images are not there community.docker.docker_image_remove: - name: "{{ item }}" + name: "sha256:{{ item }}" force: true - loop: - - "sha256:{{ docker_test_image_digest_v1_image_id }}" - - "sha256:{{ docker_test_image_digest_v2_image_id }}" + loop: "{{ docker_test_image_digest_v1_image_ids + docker_test_image_digest_v2_image_ids }}" - name: Pull image 1 community.docker.docker_image_pull: @@ -82,8 +80,6 @@ always: - name: cleanup community.docker.docker_image_remove: - name: "{{ item }}" + name: "sha256:{{ item }}" force: true - loop: - - "sha256:{{ docker_test_image_digest_v1_image_id }}" - - "sha256:{{ docker_test_image_digest_v2_image_id }}" + loop: "{{ docker_test_image_digest_v1_image_ids + docker_test_image_digest_v2_image_ids }}" diff --git a/tests/integration/targets/docker_image_push/tasks/tests/basic.yml b/tests/integration/targets/docker_image_push/tasks/tests/basic.yml index b9fab64c..5f780f85 100644 --- a/tests/integration/targets/docker_image_push/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_image_push/tasks/tests/basic.yml @@ -18,7 +18,7 @@ - name: Push image ID (must fail) community.docker.docker_image_push: - name: "sha256:{{ docker_test_image_digest_v1_image_id }}" + name: "sha256:{{ docker_test_image_digest_v1_image_ids[0] }}" register: fail_2 ignore_errors: true diff --git a/tests/integration/targets/docker_image_remove/tasks/main.yml b/tests/integration/targets/docker_image_remove/tasks/main.yml index 7f59069c..47293f90 100644 --- a/tests/integration/targets/docker_image_remove/tasks/main.yml +++ b/tests/integration/targets/docker_image_remove/tasks/main.yml @@ -8,15 +8,16 @@ # and should not be used as examples of how to write Ansible roles # #################################################################### -- block: +- vars: + image: "{{ docker_test_image_hello_world }}" + image_ids: "{{ docker_test_image_hello_world_image_ids }}" + block: - name: Pick image prefix ansible.builtin.set_fact: iname_prefix: "{{ 'ansible-docker-test-%0x' % ((2**32) | random) }}" - name: Define image names ansible.builtin.set_fact: - image: "{{ docker_test_image_hello_world }}" - image_id: "{{ docker_test_image_hello_world_image_id }}" image_names: - "{{ iname_prefix }}-tagged-1:latest" - "{{ iname_prefix }}-tagged-1:foo" @@ -24,8 +25,9 @@ - name: Remove image complete community.docker.docker_image_remove: - name: "{{ image_id }}" + name: "{{ item }}" force: true + loop: "{{ image_ids }}" - name: Remove tagged images community.docker.docker_image_remove: diff --git a/tests/integration/targets/setup_docker/vars/main.yml b/tests/integration/targets/setup_docker/vars/main.yml index 4fbb4496..97445dd4 100644 --- a/tests/integration/targets/setup_docker/vars/main.yml +++ b/tests/integration/targets/setup_docker/vars/main.yml @@ -4,12 +4,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later docker_test_image_digest_v1: e004c2cc521c95383aebb1fb5893719aa7a8eae2e7a71f316a4410784edb00a9 -docker_test_image_digest_v1_image_id: 758ec7f3a1ee85f8f08399b55641bfb13e8c1109287ddc5e22b68c3d653152ee +docker_test_image_digest_v1_image_ids: + - 758ec7f3a1ee85f8f08399b55641bfb13e8c1109287ddc5e22b68c3d653152ee # Docker 28 and before + - e004c2cc521c95383aebb1fb5893719aa7a8eae2e7a71f316a4410784edb00a9 # Docker 29 docker_test_image_digest_v2: ee44b399df993016003bf5466bd3eeb221305e9d0fa831606bc7902d149c775b -docker_test_image_digest_v2_image_id: dc3bacd8b5ea796cea5d6070c8f145df9076f26a6bc1c8981fd5b176d37de843 +docker_test_image_digest_v2_image_ids: + - dc3bacd8b5ea796cea5d6070c8f145df9076f26a6bc1c8981fd5b176d37de843 # Docker 28 and before + - ee44b399df993016003bf5466bd3eeb221305e9d0fa831606bc7902d149c775b # Docker 29 docker_test_image_digest_base: quay.io/ansible/docker-test-containers docker_test_image_hello_world: quay.io/ansible/docker-test-containers:hello-world -docker_test_image_hello_world_image_id: sha256:bf756fb1ae65adf866bd8c456593cd24beb6a0a061dedf42b26a993176745f6b +docker_test_image_hello_world_image_ids: + - sha256:bf756fb1ae65adf866bd8c456593cd24beb6a0a061dedf42b26a993176745f6b # Docker 28 and before + - sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042 # Docker 29 docker_test_image_hello_world_base: quay.io/ansible/docker-test-containers docker_test_image_busybox: quay.io/ansible/docker-test-containers:busybox docker_test_image_alpine: quay.io/ansible/docker-test-containers:alpine3.8