Skip to content

Commit

Permalink
[2.13.0] update the install type to cli instead of CLi (#2148)
Browse files Browse the repository at this point in the history
To make it easier to use the Install/Uninstall type which currently is
CLi in part of the code and Cli in another part of the code.
changing it from CLi to Cli everywhere.

related to Jira ticket: RHOAIENG-2720

cherry-picked #2144
  • Loading branch information
kobihk authored Dec 26, 2024
2 parents bf16357 + d851d76 commit d0ca658
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ods_ci/rhods_install_configuration.yaml.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RHODS_INSTALL:
INSTALL_TYPE: CLi
INSTALL_TYPE: Cli
TEST_ENV: AWS
cluster_type: managed
operator_version: quay.io/modh/qe-catalog-source:latest
Expand Down
6 changes: 3 additions & 3 deletions ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Install RHODS
${csv_display_name} = Set Variable ${RHODS_CSV_DISPLAY}
END
IF "${cluster_type}" == "selfmanaged"
IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "CLi"
IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "Cli"
Install RHODS In Self Managed Cluster Using CLI ${cluster_type} ${image_url}
ELSE IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "OperatorHub"
${file_path} = Set Variable tasks/Resources/RHODS_OLM/install/
Expand All @@ -62,12 +62,12 @@ Install RHODS
FAIL Provided test environment and install type is not supported
END
ELSE IF "${cluster_type}" == "managed"
IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "CLi" and "${UPDATE_CHANNEL}" == "odh-nightlies"
IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "Cli" and "${UPDATE_CHANNEL}" == "odh-nightlies"
# odh-nightly is not build for Managed, it is only possible for Self-Managed
Set Global Variable ${OPERATOR_NAMESPACE} openshift-marketplace
Install RHODS In Self Managed Cluster Using CLI ${cluster_type} ${image_url}
Set Global Variable ${OPERATOR_NAME} opendatahub-operator
ELSE IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "CLi"
ELSE IF "${TEST_ENV}" in "${SUPPORTED_TEST_ENV}" and "${INSTALL_TYPE}" == "Cli"
Install RHODS In Managed Cluster Using CLI ${cluster_type} ${image_url}
ELSE
FAIL Provided test environment is not supported
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Is RHODS Installed
Log Checking if RHODS is installed with "${clusterType}" "${UPDATE_CHANNEL}" "${INSTALL_TYPE}" console=yes
IF "${cluster_type}" == "selfmanaged"
IF "${INSTALL_TYPE}" == "CLi"
IF "${INSTALL_TYPE}" == "Cli"
${result}= Run Keyword And Return Status
... Run Keywords
... Check A RHODS Family Operator Is Installed namespace=${OPERATOR_NAMESPACE}
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/tasks/Resources/RHODS_OLM/uninstall/uninstall.robot
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Uninstall RHODS In OSD

Uninstall RHODS In Self Managed Cluster
[Documentation] Uninstall rhods from self-managed cluster
IF "${INSTALL_TYPE}" == "CLi"
IF "${INSTALL_TYPE}" == "Cli"
Uninstall RHODS In Self Managed Cluster Using CLI
ELSE IF "${INSTALL_TYPE}" == "OperatorHub"
Uninstall RHODS In Self Managed Cluster For Operatorhub
Expand Down

0 comments on commit d0ca658

Please sign in to comment.