RHOAIENG-23 - Cleanup CodeFlare installation code

ods_ci/tasks/Resources/RHODS_OLM/RHODS_OLM.resource

@@ -2,10 +2,8 @@
 Resource  config/cluster.robot
 Resource  install/oc_install.robot
 Resource  install/install.robot
-Resource  install/codeflare_install.resource
 Resource  pre-tasks/oc_is_operator_installed.robot
 Resource  uninstall/oc_uninstall.robot
 Resource  uninstall/uninstall.robot
-Resource  uninstall/codeflare_uninstall.resource
 Resource  upgrade/oc_upgrade.robot
 Resource  upgrade/upgrade.robot

ods_ci/tasks/Resources/RHODS_OLM/install/install.robot

@@ -2,7 +2,6 @@
 Documentation    RHODS operator installation top-level keywords
 Resource   ../pre-tasks/oc_is_operator_installed.robot
 Resource   oc_install.robot
-Resource   codeflare_install.resource
 
 
 *** Keywords ***
@@ -13,9 +12,6 @@ Installing RHODS Operator ${image_url}
   ...  Set Suite Variable  ${image_url}  AND
   ...  Set Test Variable  ${RHODS_OSD_INSTALL_REPO}  AND
   ...  Install RHODS   ${cluster_type}    ${image_url}
-  ${is_codeflare_managed} =    Is CodeFlare Managed
-  Log  Will install CodeFlare operator: ${is_codeflare_managed}  console=yes
-  IF  ${is_codeflare_managed}    Installing CodeFlare Operator
 
 RHODS Operator Should Be installed
   Verify RHODS Installation

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

@@ -68,10 +68,6 @@ Verify RHODS Installation
        Log  Verified redhat-ods-operator  console=yes
   END
 
-  # The CodeFlare operator verification needs to happen after RHODS operator and before DataScienceCluster is created!
-  ${is_codeflare_managed} =     Is CodeFlare Managed
-  Log  Will verify CodeFlare operator: ${is_codeflare_managed}  console=yes
-  IF  ${is_codeflare_managed}  CodeFlare Operator Should Be Installed
   IF  "${UPDATE_CHANNEL}" == "odh-nightlies" or "${cluster_type}" != "managed"
       Apply DataScienceCluster CustomResource    dsc_name=${DSC_NAME}
   END

ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot

@@ -77,15 +77,3 @@ Check A RHODS Family Operator Is Installed
   END
   Log   Operator with sub ${subscription} is installed result: ${result}      console=yes
   IF  not ${result}     FAIL    The operator with sub ${subscription} is not installed.
-
-Is CodeFlare Installed
-  [Documentation]   Returns if the RHODS CodeFlare operator is currently installed
-  ${result} =  Run Keyword And Return Status
-  ...  Check A RHODS Family Operator Is Installed  namespace=openshift-operators  subscription=rhods-codeflare-operator
-  Log   RHODS CodeFlare is installed: ${result}      console=yes
-  RETURN  ${result}
-
-Is CodeFlare Managed
-  [Documentation]   Returns if the RHODS CodeFlare operator should be installed/uninstalled alongside RHODS operator
-  ${isCodeFlareManaged} =    Convert To Boolean    ${MANAGE_CODEFLARE_OPERATOR}
-  RETURN  ${isCodeFlareManaged}

ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot

@@ -3,14 +3,11 @@ Resource   ../install/oc_install.robot
 Resource   ../pre-tasks/oc_is_operator_installed.robot
 Resource   ../../../../tests/Resources/Common.robot
 Resource   oc_uninstall.robot
-Resource   codeflare_uninstall.resource
 Library    Process
 
 
 *** Keywords ***
 Uninstalling RHODS Operator
-  ${is_codeflare_managed} =   Is CodeFlare Managed
-  IF  ${is_codeflare_managed}    Uninstalling CodeFlare Operator
   ${is_operator_installed} =  Is RHODS Installed
   IF  ${is_operator_installed}  Run Keywords
   ...  Log  Uninstalling RHODS operator in ${cluster_type}  console=yes  AND
@@ -45,8 +42,6 @@ Uninstall RHODS In Self Managed Cluster
   END
 
 RHODS Operator Should Be Uninstalled
-  ${is_codeflare_managed} =     Is CodeFlare Managed
-  IF  ${is_codeflare_managed}   CodeFlare Operator Should Be Uninstalled
   Verify RHODS Uninstallation
   Log  RHODS has been uninstalled  console=yes
 

ods_ci/tasks/Tasks/rhods_olm.robot

@@ -15,11 +15,8 @@ ${RHODS_OSD_INSTALL_REPO}       None
 ${TEST_ENV}                     AWS
 ${INSTALL_TYPE}                 OperatorHub
 ${UPDATE_CHANNEL}               odh-nightlies
-${MANAGE_CODEFLARE_OPERATOR}    False
-${CODEFLARE_UPDATE_CHANNEL}     odh-nightlies
 ${OLM_DIR}                      rhodsolm
 ${RHODS_VERSION}                None
-${CODEFLARE_VERSION}            None
 
 *** Tasks ***
 Can Install RHODS Operator

ods_ci/tests/Resources/Common.robot

@@ -125,21 +125,6 @@ Get RHODS Version
     Log  Product:${PRODUCT} Version:${RHODS_VERSION}
     RETURN  ${RHODS_VERSION}
 
-#robocop: disable: line-too-long
-Get CodeFlare Version
-    [Documentation]    Return RHODS CodeFlare operator version number.
-    ...    Will fetch version only if $CODEFLARE_VERSION was not already set, or $force_fetch is True.
-    [Arguments]    ${force_fetch}=False
-    IF  "${CODEFLARE_VERSION}" == "${None}" or "${force_fetch}" == "True"
-        IF  "${PRODUCT}" == "${None}" or "${PRODUCT}" == "RHODS"
-            ${CODEFLARE_VERSION}=  Run  oc get csv -n openshift-operators | grep "rhods-codeflare-operator" | awk '{print $1}' | sed 's/rhods-codeflare-operator.//'
-        ELSE
-            ${CODEFLARE_VERSION}=  Run  oc get csv -n openshift-operators | grep "codeflare-operator" | awk -F ' {2,}' '{print $3}'
-        END
-    END
-    Log  Product:${PRODUCT} CodeFlare Version:${CODEFLARE_VERSION}
-    RETURN  ${CODEFLARE_VERSION}
-
 Get Cluster ID
     [Documentation]     Retrieves the ID of the currently connected cluster
     ${cluster_id}=   Run    oc get clusterversion -o json | jq .items[].spec.clusterID

ods_ci/tests/Tests/650__distributed_workloads/test-run-dw-tests.robot

@@ -1,7 +1,6 @@
 *** Settings ***
 Documentation   Distributed workloads tests
 
-Resource         ../../../tasks/Resources/RHODS_OLM/install/codeflare_install.resource
 Resource         ../../../tasks/Resources/RHODS_OLM/install/oc_install.robot
 Resource         ../../Resources/Page/DistributedWorkloads/DistributedWorkloads.resource