Skip to content

Commit cf87cef

Browse files
committed
Makefile: Update the e2e target to use ginkgo
Update the root Makefile and update the `e2e` target to use the ginkgo executable instead of `go test ...` as logs produce when running the e2e suite aren't captured until after the process has completed. This leads to situations where failing tests aren't immediately communicated back and loss of logs entirely in the case where the process was manually teminated. Signed-off-by: timflannagan <[email protected]>
1 parent e48737c commit cf87cef

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

Makefile

+13-3
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,19 @@ setup-bare: clean e2e.namespace
119119
. ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
120120
. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
121121

122-
# e2e test exculding the rh-operators directory which tests rh-operators and their metric cardinality.
122+
# TODO(tflannag): Remove this target entirely and move downstream
123123
e2e:
124-
go test -v $(MOD_FLAGS) -failfast -timeout 150m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -ginkgo.flakeAttempts=3
124+
$(GINKGO) \
125+
./test/e2e \
126+
-flakeAttempts 3 \
127+
-randomizeAllSpecs \
128+
-v \
129+
-timeout 90m \
130+
$< -- \
131+
-namespace=openshift-operators \
132+
-kubeconfig=${KUBECONFIG} \
133+
-olmNamespace=openshift-operator-lifecycle-manager \
134+
-dummyImage=bitnami/nginx:latest
125135

126136
### Start: End To End Tests ###
127137

@@ -132,7 +142,7 @@ FORCE:
132142
# main entry point for running end to end tests. used by .github/workflows/e2e-tests.yml See test/e2e/README.md for details
133143
.PHONY: e2e-local
134144
e2e-local: bin/e2e-local.test test/e2e-local.image.tar
135-
$(GINKGO) -nodes $(or $(NODES),1) -flakeAttempts 3 -randomizeAllSpecs $(if $(TEST),-focus '$(TEST)') -v -timeout 90m $< -- -namespace=operators -olmNamespace=operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -kind.images=../test/e2e-local.image.tar
145+
$(GINKGO) -nodes $(or $(NODES),1) -flakeAttempts 1 -randomizeAllSpecs $(if $(TEST),-focus '$(TEST)') -v -timeout 90m $< -- -namespace=operators -olmNamespace=operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -kind.images=../test/e2e-local.image.tar
136146

137147
# this target updates the zz_chart.go file with files found in deploy/chart
138148
# this will always fire since it has been marked as phony

0 commit comments

Comments
 (0)