From 76eae9dbbbfd45146d16cfff3b8c9bf3c52efc5a Mon Sep 17 00:00:00 2001 From: Joe Eltgroth Date: Thu, 20 Oct 2022 16:03:14 -0500 Subject: [PATCH] Improve template tests modification Signed-off-by: Joe Eltgroth --- tests/testdata/template_and_smoke/template-ce/Makefile | 4 ++-- tests/testdata/template_and_smoke/template-http/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testdata/template_and_smoke/template-ce/Makefile b/tests/testdata/template_and_smoke/template-ce/Makefile index 09ec12a1..197e2081 100644 --- a/tests/testdata/template_and_smoke/template-ce/Makefile +++ b/tests/testdata/template_and_smoke/template-ce/Makefile @@ -7,8 +7,8 @@ template-ce.path := $(abspath $(path)) $(eval $(call INCLUDE_FILE, $(ROOT_DIR)/builder)) template-ce.image := kn-fn-test/template-ce -template-ce.java_image_paths := $(shell find $(template-ce.path) -mindepth 1 -maxdepth 1 -type l | grep java) -template-ce.python_image_paths := $(shell find $(template-ce.path) -mindepth 1 -maxdepth 1 -type l | grep python) +template-ce.java_image_paths := $(shell find $(template-ce.path) -mindepth 1 -maxdepth 1 -type l | grep java-) +template-ce.python_image_paths := $(shell find $(template-ce.path) -mindepth 1 -maxdepth 1 -type l | grep python-) $(template-ce.java_image_paths): $(PACK) $(builder.image.out) cd $@ && $(PACK) build $(template-ce.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --env BP_FUNCTION=functions.Handler --pull-policy if-not-present --clear-cache $(template-ce.python_image_paths): $(PACK) $(builder.image.out) diff --git a/tests/testdata/template_and_smoke/template-http/Makefile b/tests/testdata/template_and_smoke/template-http/Makefile index 596aebdf..817a17d7 100644 --- a/tests/testdata/template_and_smoke/template-http/Makefile +++ b/tests/testdata/template_and_smoke/template-http/Makefile @@ -7,8 +7,8 @@ template-http.path := $(abspath $(path)) $(eval $(call INCLUDE_FILE, $(ROOT_DIR)/builder)) template-http.image := kn-fn-test/template-http -template-http.java_image_paths := $(shell find $(template-http.path) -mindepth 1 -maxdepth 1 -type l | grep java) -template-http.python_image_paths := $(shell find $(template-http.path) -mindepth 1 -maxdepth 1 -type l | grep python) +template-http.java_image_paths := $(shell find $(template-http.path) -mindepth 1 -maxdepth 1 -type l | grep java-) +template-http.python_image_paths := $(shell find $(template-http.path) -mindepth 1 -maxdepth 1 -type l | grep python-) $(template-http.java_image_paths): $(PACK) $(builder.image.out) cd $@ && $(PACK) build $(template-http.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --env BP_FUNCTION=functions.Handler --pull-policy if-not-present --clear-cache $(template-http.python_image_paths): $(PACK) $(builder.image.out)