From 3547f0430a2c819c7ad6f7360283b38e84a63be0 Mon Sep 17 00:00:00 2001 From: Kobi Hakimi Date: Tue, 26 Nov 2024 01:39:31 +0200 Subject: [PATCH] remove test tags --- .../Resources/RHODS_OLM/install/oc_install.robot | 1 - ods_ci/tests/Resources/Common.robot | 2 +- ods_ci/tests/Resources/OCP.resource | 4 +++- .../tests/Resources/Page/Operators/ISVs.resource | 14 +------------- .../120__upgrades/120__pre_upgrade.robot | 7 +------ .../120__upgrades/121__during_upgrade.robot | 8 +------- .../120__upgrades/122__post_ugrade.robot | 7 +------ .../200__metrics/200__metrics.robot | 5 ----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot index 3bb8b6f60..6849555c8 100644 --- a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot +++ b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot @@ -231,7 +231,6 @@ Wait For Pods Numbers ${status} Set Variable False FOR ${counter} IN RANGE ${timeout} ${return_code} ${output} Run And Return Rc And Output oc get pod -n ${namespace} -l ${label_selector} | tail -n +2 | wc -l - Log To Console Output: ${output} RC: ${return_code} counter: ${counter} timeout: ${timeout} NS: ${namespace} label: ${label_selector} IF ${output} == ${count} ${status} Set Variable True Log To Console pods ${label_selector} created diff --git a/ods_ci/tests/Resources/Common.robot b/ods_ci/tests/Resources/Common.robot index 84e36ada5..e63c5e847 100644 --- a/ods_ci/tests/Resources/Common.robot +++ b/ods_ci/tests/Resources/Common.robot @@ -183,7 +183,7 @@ Wait Until Csv Is Ready Sleep ${check_interval} ${csv_created}= Run Process oc get csv --no-headers -n ${operators_namespace} | awk '/${display_name}/ {print \$1}' shell=yes Log To Console The Result of csv_created Output is: ${csv_created.stdout} RC: ${csv_created.rc} - IF '${csv_created.stdout}' == '${EMPTY}' CONTINUE + IF '$csv_created.stdout' == '${EMPTY}' CONTINUE # In case of upgrade there are 2 operators, we need to wait until only one will be available ${lines}= Split String ${csv_created.stdout} \n ${line_count}= Get Length ${lines} diff --git a/ods_ci/tests/Resources/OCP.resource b/ods_ci/tests/Resources/OCP.resource index 9c6fbc511..dbee6497e 100644 --- a/ods_ci/tests/Resources/OCP.resource +++ b/ods_ci/tests/Resources/OCP.resource @@ -292,7 +292,9 @@ Get Resource Attribute Wait For Installplan And Approve It [Documentation] Wait for the operator's installplan to appear then approve it in case of Manual installplan approval [Arguments] ${namespace} ${operator_name} ${operator_version}=${EMPTY} - Wait Until Keyword Succeeds 10m 5s Check If Resource Exists By Command Output oc get installplans -n ${namespace} -o yaml | grep "${operator_name}" + ${csv} = Evaluate '${operator_name}.${operator_version}' if '${operator_version}' else '${operator_name}' + Log To Console The csv is: ${csv} + Wait Until Keyword Succeeds 10m 5s Check If Resource Exists By Command Output oc get installplans -n ${namespace} -o yaml | grep "${csv}" ${installplan_name}= Run oc get subscription ${operator_name} -n ${namespace} -o json | jq '.status.installplan.name' IF "${operator_version}" != "${EMPTY}" ${installplan_version_exist}= Run And Return Rc oc get installplan -n ${namespace} | grep "${operator_version}" diff --git a/ods_ci/tests/Resources/Page/Operators/ISVs.resource b/ods_ci/tests/Resources/Page/Operators/ISVs.resource index de35980f2..a8a5836e1 100644 --- a/ods_ci/tests/Resources/Page/Operators/ISVs.resource +++ b/ods_ci/tests/Resources/Page/Operators/ISVs.resource @@ -38,19 +38,7 @@ Install ISV Operator From OperatorHub Via CLI # robocop: disable Oc Apply kind=Subscription src=${operator_sub_filepath} Wait Until Keyword Succeeds 1 min 0 sec ... Is Resource Present Subscription ${subscription_name} ${namespace} ${IS_PRESENT} -# Wait For Installplan And Approve It ${namespace} ${operator_name} - WHILE "${installplan_name}" == "${EMPTY}" limit=5m - ${installplan_name}= Get Resource Attribute ${namespace} - ... Subscription ${subscription_name} .status.installPlanRef.name - Sleep 20s - END - ${installplan_approval}= Get Resource Attribute ${namespace} - ... InstallPlan ${installplan_name} .spec.approval - IF "${installplan_approval}" == "Manual" - ${return_code} ${out}= Run And Return Rc And Output oc patch installplan ${installplan_name} -n ${namespace} --type='json' -p '[{"op": "replace", "path": "/spec/approved", "value": true}]' #robocop:disable - Should Be Equal As Integers ${return_code} 0 msg=Error while approving installplan - END -# until here + Wait For Installplan And Approve It ${namespace} ${operator_name} Create Operator Group [Documentation] Creates the Operator Group object which might be needed by an operator. diff --git a/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrade.robot b/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrade.robot index ec7b72920..0f9445be7 100644 --- a/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrade.robot +++ b/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrade.robot @@ -22,7 +22,7 @@ Resource ../../../Resources/Page/DistributedWorkloads/DistributedWorkl Resource ../../../Resources/Page/DistributedWorkloads/WorkloadMetricsUI.resource Suite Setup Dashboard Suite Setup Suite Teardown RHOSi Teardown -Test Tags PreUpgradeKobi +Test Tags PreUpgrade *** Variables *** @@ -39,11 +39,6 @@ ${MODEL_CREATED}= ${FALSE} ${RUNTIME_NAME}= Model Serving Test *** Test Cases *** -Test PreUpgrade - [Documentation] Test for pre upgrade - [Tags] PreUpgrade - Log To Console This is test of PreUpgrade - Set PVC Size Via UI [Documentation] Sets a Pod toleration via the admin UI [Tags] Upgrade diff --git a/ods_ci/tests/Tests/100__deploy/120__upgrades/121__during_upgrade.robot b/ods_ci/tests/Tests/100__deploy/120__upgrades/121__during_upgrade.robot index 522851c48..b69fc5ff3 100644 --- a/ods_ci/tests/Tests/100__deploy/120__upgrades/121__during_upgrade.robot +++ b/ods_ci/tests/Tests/100__deploy/120__upgrades/121__during_upgrade.robot @@ -9,7 +9,7 @@ Resource ../../../Resources/Page/ODH/ODHDashboard/ODHDashboardSetting Resource ../../../Resources/Page/ODH/JupyterHub/ODHJupyterhub.resource Library DebugLibrary Library JupyterLibrary -Test Tags DuringUpgradeKobi +Test Tags DuringUpgrade *** Variables *** @@ -18,11 +18,6 @@ ${UPGRADE_TO_IIB}= ${EMPTY} *** Test Cases *** -Test DuringUpgrade - [Documentation] Test for during upgrade - [Tags] DuringUpgrade - Log To Console This is test of DuringUpgrade - Long Running Jupyter Notebook [Documentation] Launch a long running notebook before the upgrade [Tags] Upgrade @@ -37,7 +32,6 @@ Upgrade RHODS [Documentation] Approve the install plan for the upgrade and make sure that upgrade has completed [Tags] ODS-1766 ... Upgrade - ... DuringUpgrade ${initial_version} = Get RHODS Version ${initial_creation_date} = Get Operator Pod Creation Date Set Suite Variable ${UPDATE_CHANNEL} ${UPGRADE_TO_UPDATE_CHANNEL} diff --git a/ods_ci/tests/Tests/100__deploy/120__upgrades/122__post_ugrade.robot b/ods_ci/tests/Tests/100__deploy/120__upgrades/122__post_ugrade.robot index 7e8c29e02..0d5dc3bb3 100644 --- a/ods_ci/tests/Tests/100__deploy/120__upgrades/122__post_ugrade.robot +++ b/ods_ci/tests/Tests/100__deploy/120__upgrades/122__post_ugrade.robot @@ -18,7 +18,7 @@ Resource ../../../Resources/Page/OCPDashboard/Pods/Pods.robot Resource ../../../Resources/Page/OCPDashboard/Builds/Builds.robot Resource ../../../Resources/Page/HybridCloudConsole/OCM.robot Resource ../../../Resources/Page/DistributedWorkloads/DistributedWorkloads.resource -Test Tags PostUpgradeKobi +Test Tags PostUpgrade *** Variables *** @@ -35,11 +35,6 @@ ${RUNTIME_NAME}= Model Serving Test *** Test Cases *** -Test PostUpgrade - [Documentation] Test for post upgrade - [Tags] PostUpgrade - Log To Console This is test of PostUpgrade - Verify PVC Size [Documentation] Verify PVC Size after the upgrade [Tags] Upgrade diff --git a/ods_ci/tests/Tests/200__monitor_and_manage/200__metrics/200__metrics.robot b/ods_ci/tests/Tests/200__monitor_and_manage/200__metrics/200__metrics.robot index ab73fd3c3..f46a50921 100644 --- a/ods_ci/tests/Tests/200__monitor_and_manage/200__metrics/200__metrics.robot +++ b/ods_ci/tests/Tests/200__monitor_and_manage/200__metrics/200__metrics.robot @@ -23,11 +23,6 @@ Test Tags ExcludeOnODH *** Test Cases *** -Test Smoke - [Documentation] Test for smoke - [Tags] SmokeKobi - Log To Console This is test of SmokeKobi - Test Existence of Prometheus Alerting Rules [Documentation] Verifies the prometheus alerting rules [Tags] Smoke