Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RHOAIENG-23 - Cleanup CodeFlare installation code #1180

Merged
merged 1 commit into from
Feb 27, 2024
Merged

RHOAIENG-23 - Cleanup CodeFlare installation code #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ods_ci/tasks/Resources/Files/codeflare_sub_template.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ods_ci/tasks/Resources/RHODS_OLM/RHODS_OLM.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
53 changes: 0 additions & 53 deletions ods_ci/tasks/Resources/RHODS_OLM/install/codeflare_install.resource
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ods_ci/tasks/Resources/RHODS_OLM/install/install.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ***
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,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
Expand Down
12 changes: 0 additions & 12 deletions ods_ci/tasks/Resources/RHODS_OLM/pre-tasks/oc_is_operator_installed.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
58 changes: 0 additions & 58 deletions ods_ci/tasks/Resources/RHODS_OLM/uninstall/codeflare_uninstall.resource
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this line should stay

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sutaakar
Yes, it is true. Thank you for noticing it. It should be fixed now.

IF ${is_operator_installed} Run Keywords
... Log Uninstalling RHODS operator in ${cluster_type} console=yes AND
Expand Down Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions ods_ci/tasks/Tasks/rhods_olm.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ods_ci/tests/Tests/650__distributed_workloads/test-run-dw-tests.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading