Skip to content

Commit b8aaab5

Browse files
committed
Summary template path fix + prometheus skip
Fixes the template path for summary generation and skips prometheus deployment when summary is not enabled to speed up testing. Signed-off-by: Daniel Franz <dfranz@redhat.com>
1 parent fb28936 commit b8aaab5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,11 @@ test-experimental-e2e: run-internal image-registry prometheus e2e e2e-coverage k
321321
prometheus: PROMETHEUS_NAMESPACE := olmv1-system
322322
prometheus: PROMETHEUS_VERSION := v0.83.0
323323
prometheus: $(KUSTOMIZE) #EXHELP Deploy Prometheus into specified namespace
324+
ifeq ($(strip $(E2E_SUMMARY_OUTPUT)),)
325+
@echo "E2E_SUMMARY_OUTPUT unset; skipping prometheus deployment"
326+
else
324327
./hack/test/install-prometheus.sh $(PROMETHEUS_NAMESPACE) $(PROMETHEUS_VERSION) $(VERSION) $(PROMETHEUS_VALUES)
328+
endif
325329

326330
.PHONY: test-extension-developer-e2e
327331
test-extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)

internal/shared/util/test/summary.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func executeTemplate(templateFile string, obj any) (string, error) {
160160
if err != nil {
161161
return "", fmt.Errorf("failed to get working directory: %w", err)
162162
}
163-
tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/testutils/templates", templateFile))
163+
tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/test/templates", templateFile))
164164
if err != nil {
165165
return "", err
166166
}

0 commit comments

Comments
 (0)