Skip to content
This repository was archived by the owner on Oct 3, 2019. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,12 @@ endif
$(Q)-oc delete project $(TEST_NAMESPACE) --wait

.PHONY: test-e2e-olm
test-e2e-olm:
$(eval OPENSHIFT_REGISTRY := registry.svc.ci.openshift.org)
docker pull $(OPENSHIFT_REGISTRY)/${OPENSHIFT_BUILD_NAMESPACE}/stable:devconsole-operator
test-e2e-olm: get-test-namespace ./vendor
$(Q)oc new-project $(TEST_NAMESPACE)
$(Q)sed -e "s,REPLACE_IMAGE,registry.svc.ci.openshift.org/${OPENSHIFT_BUILD_NAMESPACE}/stable:devconsole-operator-registry," ./test/e2e/catalog_source_OS4.yaml | oc apply -f -
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that this is a very CI specific target. Could you please add a prefix to it? ci-test-e2e-olm

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will add a -ci suffix

$(Q)oc apply -f ./test/e2e/subscription_OS4.yaml
$(eval DEPLOYED_NAMESPACE := openshift-operators)
$(Q)operator-sdk test local ./test/e2e --namespace $(TEST_NAMESPACE) --no-setup --go-test-flags "-v -timeout=15m"

.PHONY: test-e2e-ci
test-e2e-ci: get-test-namespace ./vendor
Expand Down