Skip to content

Commit 584e12a

Browse files
authored
Makefile: Update the e2e target to use ginkgo (#2367)
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 396b546 commit 584e12a

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Makefile

+11-2
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,18 @@ 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+
GINKGO_OPTS := -flakeAttempts 3 -randomizeAllSpecs -v --timeout 120m
123+
124+
# TODO(tflannag): Remove this target entirely and move downstream
123125
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
126+
$(GINKGO) \
127+
./test/e2e \
128+
$(GINKGO_OPTS) \
129+
$< -- \
130+
-namespace=openshift-operators \
131+
-kubeconfig=${KUBECONFIG} \
132+
-olmNamespace=openshift-operator-lifecycle-manager \
133+
-dummyImage=bitnami/nginx:latest
125134

126135
### Start: End To End Tests ###
127136

0 commit comments

Comments
 (0)