From f9461bb441f2975f0a3241b1f428c89f7e1c3129 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 8 Jul 2024 09:04:06 +0200 Subject: [PATCH] Get rid of hello-world image, 1/2 (#924) * Use our image for pull test. * Add 386 versions of the images. --- tests/images/build.sh | 2 +- tests/images/healthcheck/build.sh | 2 +- .../integration/targets/docker_image_pull/tasks/tests/basic.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/images/build.sh b/tests/images/build.sh index f0fad13e..05301212 100755 --- a/tests/images/build.sh +++ b/tests/images/build.sh @@ -13,7 +13,7 @@ IMAGE_NAME="${1:-localhost/$(basename "$(pwd)"):latest}" podman manifest rm "${IMAGE_NAME}" || true podman image rm "${IMAGE_NAME}" || true buildah manifest create "${IMAGE_NAME}" -for ARCH in amd64 arm64; do +for ARCH in amd64 arm64 386; do rm -f "main-${ARCH}" GOARCH="${ARCH}" go build -ldflags "-s -w" -o "main-${ARCH}" main.go diff --git a/tests/images/healthcheck/build.sh b/tests/images/healthcheck/build.sh index 80e9a63a..b8f9915d 100755 --- a/tests/images/healthcheck/build.sh +++ b/tests/images/healthcheck/build.sh @@ -15,7 +15,7 @@ IMAGE_NAME="${1:-localhost/$(basename "$(pwd)"):latest}" podman manifest rm "${IMAGE_NAME}" || true podman image rm "${IMAGE_NAME}" || true buildah manifest create "${IMAGE_NAME}" -for ARCH in amd64 arm64; do +for ARCH in amd64 arm64 386; do for PROGRAM in ${PROGRAMS}; do rm -f "${PROGRAM}-${ARCH}" GOARCH="${ARCH}" go build -ldflags "-s -w" -o "${PROGRAM}-${ARCH}" "${PROGRAM}.go" diff --git a/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml b/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml index 23e1f092..774917d5 100644 --- a/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_image_pull/tasks/tests/basic.yml @@ -5,7 +5,7 @@ - name: Basic pull tests vars: - image_name: "{{ docker_test_image_hello_world_platform }}" + image_name: "{{ docker_test_image_simple_1 }}" block: - name: Make sure image is not there docker_image_remove: