Skip to content

Commit

Permalink
SRVCLI-363 Build multiarch test images (knative#9)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
openshift-cherrypick-robot and mgencur authored Nov 30, 2022
1 parent 8813495 commit 9cf8003
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 9cf8003

Please sign in to comment.