From 9cf80030cdf4d5b5be2f06527a5bf2c02a69b3f6 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Wed, 30 Nov 2022 13:12:16 +0000 Subject: [PATCH] SRVCLI-363 Build multiarch test images (#9) Simply list all the test images. The previous find command included also o./vendor/knative.dev/serving/test/test_images/grpc-ping/proto which is not correct and the image build would be redundant. Co-authored-by: Martin Gencur --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b90993ca09..d819704536 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,9 @@ CGO_ENABLED=0 GOOS=linux -TEST_IMAGES=$(shell find -L ./test/test_images ./vendor/knative.dev/serving/test/test_images/grpc-ping ./vendor/knative.dev/serving/test/test_images/multicontainer -mindepth 1 -maxdepth 2 -type f -name "*.go" -exec dirname {} \;) +TEST_IMAGES=./test/test_images/helloworld ./vendor/knative.dev/serving/test/test_images/grpc-ping ./vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer ./vendor/knative.dev/serving/test/test_images/multicontainer/sidecarcontainer TEST= -DOCKER_REPO_OVERRIDE= +TEST_IMAGE_TAG ?= latest install: build cp ./kn $(GOPATH)/bin @@ -42,7 +42,7 @@ test-install: test-images: for img in $(TEST_IMAGES); do \ - KO_DOCKER_REPO=$(DOCKER_REPO_OVERRIDE) ko resolve --tags=latest -RBf $$img/ ; \ + KO_DOCKER_REPO=$(DOCKER_REPO_OVERRIDE) ko build --tags=$(TEST_IMAGE_TAG) $(KO_FLAGS) -B $$img ; \ done .PHONY: test-images