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

[2.11.0] update the install type to cli instead of CLi #2149

Merged
merged 1 commit into from
Dec 26, 2024
Merged

[2.11.0] update the install type to cli instead of CLi #2149

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
2 changes: 1 addition & 1 deletion ods_ci/rhods_install_configuration.yaml.example
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
${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 @@ -61,11 +61,11 @@
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

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning

Line is too long (124/120)
Install RHODS In Self Managed Cluster Using CLI ${cluster_type} ${image_url}
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
2 changes: 1 addition & 1 deletion 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 @@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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
Loading