diff --git a/ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot b/ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot index e167891cd..1db3af8d9 100644 --- a/ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot +++ b/ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot @@ -21,13 +21,10 @@ Uninstalling RHODS Operator ... Uninstall RHODS Uninstall RHODS - ${new_operator} = Is RHODS Version Greater Or Equal Than 2.0.0 - IF "${cluster_type}" == "managed" and ${new_operator} == $False + IF "${cluster_type}" == "managed" Uninstall RHODS In OSD - ELSE IF "${cluster_type}" == "selfmanaged" and ${new_operator} == $False + ELSE IF "${cluster_type}" == "selfmanaged" Uninstall RHODS In Self Managed Cluster - ELSE IF ${new_operator} - Uninstall RHODS V2 ELSE Fail Kindly provide supported cluster type END @@ -45,7 +42,7 @@ Uninstall RHODS In Self Managed Cluster ELSE IF "${INSTALL_TYPE}" == "OperatorHub" Uninstall RHODS In Self Managed Cluster For Operatorhub ELSE - FAIL Provided install type is not supported + FAIL Provided install type is not supported END RHODS Operator Should Be Uninstalled