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.

Sign up for GitHub

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

Revert "Use Addon CatalogSource from openshift-marketplace" #929

Merged
merged 1 commit into from
Sep 15, 2023
Merged

Revert "Use Addon CatalogSource from openshift-marketplace" #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Is RHODS Installed
... Oc Get kind=Namespace field_selector=metadata.name=redhat-ods-monitoring AND
... Oc Get kind=Namespace field_selector=metadata.name=redhat-ods-applications AND
... Oc Get kind=Namespace field_selector=metadata.name=redhat-ods-operator AND
... Oc Get kind=CatalogSource namespace=openshift-marketplace
... Oc Get kind=CatalogSource namespace=redhat-ods-operator
... field_selector=metadata.name=addon-managed-odh-catalog
END
END
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/tests/Resources/OCP.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Is RHODS Self-Managed
${is_managed} = Run Keyword And Return Status OpenshiftLibrary.Oc Get
... kind=CatalogSource
... name=addon-managed-odh-catalog
... namespace=openshift-marketplace
... namespace=${OPERATOR_NAMESPACE}
Run Keyword And Return Evaluate not ${is_managed}

Get MachineSets
Expand Down