diff --git a/ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot b/ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot index c1179a7e3..768f213ae 100644 --- a/ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot +++ b/ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot @@ -19,13 +19,20 @@ Is RHODS Installed ... field_selector=metadata.name=redhat-operators END ELSE IF "${cluster_type}" == "managed" - ${result}= Run Keyword And Return Status - ... Run Keywords - ... Oc Get kind=OdhDashboardConfig namespace=redhat-ods-applications AND - ... 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=redhat-ods-operator - ... field_selector=metadata.name=addon-managed-odh-catalog + IF "${UPDATE_CHANNEL}" == "odh-nightlies" + ${result}= Run Keyword And Return Status + ... Run Keywords + ... Oc Get kind=OdhDashboardConfig namespace=opendatahub AND + ... Oc Get kind=Namespace field_selector=metadata.name=redhat-ods-operator + ELSE + ${result}= Run Keyword And Return Status + ... Run Keywords + ... Oc Get kind=OdhDashboardConfig namespace=redhat-ods-applications AND + ... 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=redhat-ods-operator + ... field_selector=metadata.name=addon-managed-odh-catalog + END END RETURN ${result}