From e92d569516dfafac1da3df4518df154fa10c3fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Sanz=20G=C3=B3miz?= Date: Tue, 10 Dec 2024 17:36:37 +0100 Subject: [PATCH 1/2] Updated locators for Verify RHODS Accept Multiple Admin Groups And CRD Gets Updates --- .../Page/ODH/ODHDashboard/ODHDashboardSettings.resource | 6 +++--- .../tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot | 2 +- .../Tests/0200__rhoai_upgrade/0203__post_upgrade.robot | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource index f290c7375..98884a2c9 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource @@ -21,7 +21,7 @@ ${SAVE_BUTTON}= //button[@data-testid="save-new-button"] Add OpenShift Groups To Data Science Administrators [Documentation] Add OpenShift Groups to Data Science administrators From RHODS Dashboard [Arguments] @{admin_groups} - Click Button ${ADMIN_GROUPS_SECTION}//button[@aria-label="Options menu"] + Click Button ${ADMIN_GROUPS_SECTION}//button[@aria-label="Select the OpenShift groups that contain all Data Science administrators."] FOR ${group} IN @{admin_groups} ${present}= Run Keyword And Return Status Element Should Be Visible ... ${ADMIN_GROUPS_LIST}//*[text()="${group}"] @@ -34,7 +34,7 @@ Add OpenShift Groups To Data Science Administrators Add OpenShift Groups To Data Science User Groups [Documentation] Add OpenShift Groups to Data Science User From RHODS Dashboard [Arguments] @{user_groups} - Click Button ${USER_GROUPS_SECTION}//button[@aria-label="Options menu"] + Click Button ${USER_GROUPS_SECTION}//button[@aria-label="Select the OpenShift groups that contain all Data Science users."] FOR ${group} IN @{user_groups} ${present}= Run Keyword And Return Status Element Should Be Visible ... ${USER_GROUPS_LIST}//*[text()="${group}"] @@ -55,7 +55,7 @@ Launch Dashboard And Check User Management Option Is Available For The User IF ${settings_should_be} # Wait up to 2 minutes as a workaround for bug RHOAIENG-11116 Menu.Navigate To Page Settings User management timeout=2m - Wait Until Element Is Visible //button[@aria-label="Options menu"] timeout=10s + Wait Until Element Is Visible //button[@aria-label="Select the OpenShift groups that contain all Data Science administrators."] timeout=10s # This locator is failing ELSE Verify Cluster Settings Is Not Available END diff --git a/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot b/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot index 6e09d1630..276e0cd89 100644 --- a/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot +++ b/ods_ci/tests/Tests/0200__rhoai_upgrade/0201__pre_upgrade.robot @@ -64,7 +64,7 @@ Setting Pod Toleration Via UI Verify RHODS Accept Multiple Admin Groups And CRD Gets Updates [Documentation] Verify that users can set multiple admin groups and ... check OdhDashboardConfig CRD gets updated according to Admin UI - [Tags] Upgrade AutomationBug RHOAIENG-14306 + [Tags] Upgrade RHOAIENG-14306 [Setup] Begin Web Test # robocop: disable Launch Dashboard And Check User Management Option Is Available For The User diff --git a/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot b/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot index f6b629fbe..fb73e4307 100644 --- a/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot +++ b/ods_ci/tests/Tests/0200__rhoai_upgrade/0203__post_upgrade.robot @@ -53,7 +53,7 @@ Verify Pod Toleration Verify RHODS User Groups [Documentation] Verify User Configuration after the upgrade - [Tags] Upgrade AutomationBug + [Tags] Upgrade ${admin} Set Variable ${payload[0]['spec']['groupsConfig']['adminGroups']} ${user} Set Variable ${payload[0]['spec']['groupsConfig']['allowedGroups']} Should Be Equal As Strings '${admin}' 'rhods-admins,rhods-users' From 170b8f3a637b67aa13e6622d9a0e17510bda6b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Sanz=20G=C3=B3miz?= Date: Tue, 10 Dec 2024 17:50:44 +0100 Subject: [PATCH 2/2] removed comment --- .../Page/ODH/ODHDashboard/ODHDashboardSettings.resource | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource index 98884a2c9..f981cb747 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource @@ -55,7 +55,7 @@ Launch Dashboard And Check User Management Option Is Available For The User IF ${settings_should_be} # Wait up to 2 minutes as a workaround for bug RHOAIENG-11116 Menu.Navigate To Page Settings User management timeout=2m - Wait Until Element Is Visible //button[@aria-label="Select the OpenShift groups that contain all Data Science administrators."] timeout=10s # This locator is failing + Wait Until Element Is Visible //button[@aria-label="Select the OpenShift groups that contain all Data Science administrators."] timeout=10s ELSE Verify Cluster Settings Is Not Available END