Add fix for odh-nightlies on manaed cluster (red-hat-data-services#915)

Signed-off-by: Tarun Kumar <[email protected]>
ChughShilpa · Nov 27, 2023 · 2d171a8 · 2d171a8
1 parent ae482ab
commit 2d171a8
Showing 1 changed file with 15 additions and 8 deletions.
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
@@ -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}