Fix template tests

Signed-off-by: Joe Eltgroth <[email protected]>

Author: joeeltgroth

tests/testdata/template_and_smoke/template-ce/Makefile

@@ -7,14 +7,17 @@ template-ce.path := $(abspath $(path))
 $(eval $(call INCLUDE_FILE, $(ROOT_DIR)/builder))
 
 template-ce.image := kn-fn-test/template-ce
-template-ce.image_paths := $(shell find $(template-ce.path) -mindepth 1 -maxdepth 1 -type l)
-$(template-ce.image_paths): $(PACK) $(builder.image.out)
-	cd $@ && $(PACK) build $(template-ce.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --pull-policy if-not-present --clear-cache
+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)
+	cd $@ && $(PACK) build $(template-ce.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --env BP_FUNCTION=func.main --pull-policy if-not-present --clear-cache
 
 template-ce.clean := $(addsuffix .clean,$(template-ce.image_paths))
 $(template-ce.clean):
 	-docker rmi -f $(template-ce.image):$(basename $(notdir $@))
 
 .PHONY: template-tests.images
-template-tests.images .PHONY: $(template-ce.image_paths)
+template-tests.images .PHONY: $(template-ce.java_image_paths) $(template-ce.python_image_paths)
 clean .PHONY: $(template-ce.clean)

tests/testdata/template_and_smoke/template-http/Makefile

@@ -7,14 +7,17 @@ template-http.path := $(abspath $(path))
 $(eval $(call INCLUDE_FILE, $(ROOT_DIR)/builder))
 
 template-http.image := kn-fn-test/template-http
-template-http.image_paths := $(shell find $(template-http.path) -mindepth 1 -maxdepth 1 -type l)
-$(template-http.image_paths): $(PACK) $(builder.image.out)
-	cd $@ && $(PACK) build $(template-http.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --pull-policy if-not-present --clear-cache
+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)
+	cd $@ && $(PACK) build $(template-http.image):$(notdir $@) --builder $(shell cat $(builder.image.out)) --env BP_FUNCTION=func.main --pull-policy if-not-present --clear-cache
 
 template-http.clean := $(addsuffix .clean,$(template-http.image_paths))
 $(template-http.clean):
 	-docker rmi -f $(template-http.image):$(basename $(notdir $@))
 
 .PHONY: template-tests.images
-template-tests.images .PHONY: $(template-http.image_paths)
+template-tests.images .PHONY: $(template-http.java_image_paths) $(template-http.python_image_paths)
 clean .PHONY: $(template-http.clean)