Get rid of hello-world image, 2/2 (#925)

* Use our image for container platform test. * Remove docker_test_image_hello_world_platform image.
ansible-collections · Jul 8, 2024 · 8e8a091 · 8e8a091
1 parent f9461bb
commit 8e8a091
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/tests/integration/targets/docker_container/tasks/tests/options.yml b/tests/integration/targets/docker_container/tasks/tests/options.yml
@@ -3605,13 +3605,13 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
 ## platform ########################################################
 ####################################################################
 
-- name: Remove hello-world image
+- name: Remove test image
   docker_image_remove:
-    name: "{{ docker_test_image_hello_world_platform }}"
+    name: "{{ docker_test_image_simple_1 }}"
 
 - name: platform
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     pull: true
@@ -3624,7 +3624,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
   # Docker daemon only returns 'linux' as the platform for the container,
   # so this has to be handled correctly by our additional code
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     platform: linux/amd64
@@ -3634,7 +3634,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
 
 - name: platform (idempotency with shorter name)
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     platform: linux
@@ -3644,7 +3644,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
 
 - name: platform (idempotency with shorter name)
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     platform: amd64
@@ -3654,7 +3654,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
 
 - name: platform (changed)
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     pull: true
@@ -3669,7 +3669,7 @@ avoid such warnings, please quote the value.' in (log_options_2.warnings | defau
 
 - name: platform (idempotency)
   docker_container:
-    image: "{{ docker_test_image_hello_world_platform }}"
+    image: "{{ docker_test_image_simple_1 }}"
     name: "{{ cname }}"
     state: present
     pull: true

diff --git a/tests/integration/targets/setup_docker/vars/main.yml b/tests/integration/targets/setup_docker/vars/main.yml
@@ -11,7 +11,6 @@ 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_base: quay.io/ansible/docker-test-containers
-docker_test_image_hello_world_platform: docker.io/library/hello-world:latest
 docker_test_image_busybox: quay.io/ansible/docker-test-containers:busybox
 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