Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests to remove codeflare subscription creation #139

Merged
Merged
Show file tree
Hide file tree
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
18 changes: 2 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ help: ## Display this help.
.PHONY: all-in-one # All-In-One
all-in-one: ## Install distributed AI platform
@echo -e "\n==> Installing Everything needed for distributed AI platform on OpenShift cluster \n"
-make delete-codeflare delete-nfd-operator delete-nvidia-operator delete-codeflare-operator delete-opendatahub-operator
make install-opendatahub-operator install-codeflare-operator install-nfd-operator install-nvidia-operator deploy-codeflare
-make delete-codeflare delete-nfd-operator delete-nvidia-operator delete-opendatahub-operator
make install-opendatahub-operator install-nfd-operator install-nvidia-operator deploy-codeflare
make opendatahub-dashboard
@echo -e "\n==> Done (Deploy everything)\n"

Expand All @@ -54,20 +54,6 @@ delete-opendatahub-operator: ## Delete OpenDataHub operator
-export CLUSTER_SERVICE_VERSION=`oc get clusterserviceversion -n openshift-operators -l operators.coreos.com/opendatahub-operator.openshift-operators -o custom-columns=:metadata.name`; \
oc delete clusterserviceversion $$CLUSTER_SERVICE_VERSION -n openshift-operators

.PHONY: install-codeflare-operator
install-codeflare-operator: ## Install CodeFlare operator
@echo -e "\n==> Installing CodeFlare Operator \n"
oc create -f contrib/configuration/codeflare-operator-subscription.yaml
@echo Waiting for codeflare-operator Subscription to be ready
oc wait -n openshift-operators subscription/codeflare-operator --for=jsonpath='{.status.state}'=AtLatestKnown --timeout=180s

.PHONY: delete-codeflare-operator
delete-codeflare-operator: ## Delete CodeFlare operator
@echo -e "\n==> Deleting CodeFlare Operator \n"
-oc delete subscription codeflare-operator -n openshift-operators
-export CLUSTER_SERVICE_VERSION=`oc get clusterserviceversion -n openshift-operators -l operators.coreos.com/codeflare-operator.openshift-operators -o custom-columns=:metadata.name`; \
oc delete clusterserviceversion $$CLUSTER_SERVICE_VERSION -n openshift-operators

.PHONY: install-codeflare-operator-from-github
install-codeflare-operator-from-github: ## Install CodeFlare operator from main branch on GitHub
@echo -e "\n==> Installing CodeFlare Operator from main branch on GitHub \n"
Expand Down
13 changes: 0 additions & 13 deletions contrib/configuration/codeflare-operator-subscription.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
# Go to the root folder of the repository
cd ..

# Install CodeFlare operator
make install-codeflare-operator

# Install ODH operator
make install-opendatahub-operator

Expand Down