Skip to content

Commit ef89567

Browse files
author
bowenislandsong
committed
refactor rh-operator test directory
The rh-operator tests including metric cardinality is not in scope of OLM e2e tests. This commit moves those tests out of e2e directory and avoids those tests from becoming e2e tests targets. The commit also reverts a change in the makefile that avoided them as test targets from previous directory layout. The rh-operator tests are removable from OLM repo and should require least amount of effort in removing them as makefile targets.
1 parent 8775d5a commit ef89567

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ setup-bare: clean e2e.namespace
109109

110110
# e2e test exculding the rh-operators directory which tests rh-operators and their metric cardinality.
111111
e2e:
112-
go test -v $(MOD_FLAGS) -failfast -timeout 70m `go list ./test/e2e/... | grep -v /rh-operators` -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest
112+
go test -v $(MOD_FLAGS) -failfast -timeout 70m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest
113113

114114
e2e-local: build-linux build-wait
115115
. ./scripts/build_local.sh
@@ -123,7 +123,7 @@ e2e-local-docker:
123123
. ./scripts/run_e2e_docker.sh $(TEST)
124124

125125
e2e-operator-metrics:
126-
go test -v $(MOD_FLAGS) -failfast -timeout 70m ./test/e2e/rh-operators
126+
go test -v $(MOD_FLAGS) -failfast -timeout 70m ./test/rh-operators/...
127127

128128
vendor:
129129
go mod tidy

0 commit comments

Comments
 (0)