Add support to uninstall odh-buightly operator (red-hat-data-services…

…#914) Signed-off-by: Tarun Kumar <[email protected]>
ChughShilpa · Nov 27, 2023 · ae482ab · ae482ab
1 parent a288242
commit ae482ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 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
@@ -1,14 +1,23 @@
 *** Keywords ***
 Is RHODS Installed
   IF  "${cluster_type}" == "selfmanaged"
-      ${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=openshift-marketplace
-      ...          field_selector=metadata.name=redhat-operators
+      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  AND
+          ...  Oc Get  kind=CatalogSource  namespace=openshift-marketplace
+          ...          field_selector=metadata.name=redhat-operators
+      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=openshift-marketplace
+          ...          field_selector=metadata.name=redhat-operators
+      END
   ELSE IF  "${cluster_type}" == "managed"
       ${result}=  Run Keyword And Return Status
       ...  Run Keywords

diff --git a/ods_ci/tasks/Tasks/rhods_olm.robot b/ods_ci/tasks/Tasks/rhods_olm.robot
@@ -14,9 +14,8 @@ ${RHODS_OSD_INSTALL_REPO}    None
 @{SUPPORTED_TEST_ENV}        AWS   GCP   PSI
 ${TEST_ENV}                  AWS
 ${INSTALL_TYPE}              OperatorHub
-${UPDATE_CHANNEL}            beta
+${UPDATE_CHANNEL}            odh-nightlies
 ${OLM_DIR}                   rhodsolm
-
 *** Tasks ***
 Can Install RHODS Operator
   [Tags]  install