Fix Dashboard Tests for ODH and RHOAI 2.9 #1308

manosnoam · 2024-03-19T10:14:39Z

Including fixing dependent KW and tests:

Fix Verify RHODS Display Name and Version for ODH
Set $DASHBOARD_APP_NAME according to RHODS / ODH
Fix Verify Favorite Resource Cards test
Fix Sort Resources By KW
Fix Verify Jupyter Card CSS Style KW
Fix Upload Serving Runtime Template in ODHDashboard Settings
Update DEFAULT_NOTEBOOK_VER=2024.1 and PREVIOUS_NOTEBOOK_VER=2023.2
Search Pod KW returns a list of pods that match regular expression
Verify Jupiter Service Is Not Enabled should not wait long (app isn't present)
Remove Test Billing Metric test (5+ minutes) from Smoke

ods_ci/tests/Tests/100__deploy/100__installation/104__dashboard.robot

@@ -133,7 +133,7 @@
    ...        None
    ...    Returns:
    ...        dashboard_pods_info(list(dict)): Dashboard pods selected by label and namespace
-    @{dashboard_pods_info} =    Oc Get    kind=Pod    api_version=v1    namespace=${APPLICATIONS_NAMESPACE}    label_selector=app=rhods-dashboard
+    @{dashboard_pods_info} =    Oc Get    kind=Pod    api_version=v1    namespace=${APPLICATIONS_NAMESPACE}    label_selector=app=${DASHBOARD_APP_NAME}


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

@@ -750,7 +744,7 @@

 Get Dashboard Pods Names
    [Documentation]     Retrieves the names of dashboard pods
-    ${dash_pods}=    Oc Get    kind=Pod    namespace=${APPLICATIONS_NAMESPACE}     label_selector=app=rhods-dashboard
+    ${dash_pods}=    Oc Get    kind=Pod    namespace=${APPLICATIONS_NAMESPACE}     label_selector=app=${DASHBOARD_APP_NAME}


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

@@ -761,7 +755,7 @@
 Get Dashboard Pod Logs
    [Documentation]     Fetches the logs from one dashboard pod
    [Arguments]     ${pod_name}
-    ${pod_logs}=    Oc Get Pod Logs  name=${pod_name}  namespace=${APPLICATIONS_NAMESPACE}  container=rhods-dashboard
+    ${pod_logs}=    Oc Get Pod Logs  name=${pod_name}  namespace=${APPLICATIONS_NAMESPACE}  container=${DASHBOARD_APP_NAME}


ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot

ods_ci/tests/Resources/RHOSi.resource

@@ -73,6 +73,7 @@
    ${RHODS_VERSION}=    Get RHODS Version    ${force_fetch}
    Set Global Variable   ${RHODS_VERSION}
    Set Prometheus Variables
+    Set Global Variable    ${DASHBOARD_APP_NAME}    ${PRODUCT.lower()}-dashboard


ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

    Sort Resources By    name
    ${list_of_tile_ids} =    Get List Of Ids Of Tiles
    Verify Star Icons Are Clickable    ${list_of_tile_ids}

-    ${favorite_ids} =    Get Slice From List    ${list_of_tile_ids}    ${27}    ${48}
+    ${favorite_ids} =    Get Slice From List    ${list_of_tile_ids}    ${2}    ${7}


ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

@@ -299,7 +311,7 @@
    [Tags]    Sanity
    ...       Tier1
    ...       ODS-374
-    ${pod_names}    Get POD Names    ${APPLICATIONS_NAMESPACE}    app=rhods-dashboard
+    ${pod_names}    Get POD Names    ${APPLICATIONS_NAMESPACE}    app=${DASHBOARD_APP_NAME}


ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

-    Should Be Equal    ${not_clicked}    odh-dashboard__favorite
-    Click Element    //*[@id="${id}"]/div[1]/span
+    ${card_star_button}=    Set Variable    //*[@id="${id}" and contains(@class, "odh-tourable-card")]//button
+    ${not_clicked} =    Get Element Attribute    ${card_star_button}    aria-label


ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

-    Should Be Equal    ${clicked}    odh-dashboard__favorite m-is-favorite
-    Click Element    //*[@id="${id}"]/div[1]/span
+    ${card_star_button}=    Set Variable    //*[@id="${id}" and contains(@class, "odh-tourable-card")]//button
+    ${clicked} =    Get Element Attribute    ${card_star_button}    aria-label


ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

@@ -480,18 +494,15 @@
    Close Browser

 RHODS Dahsboard Pod Should Contain OauthProxy Container
-    ${list_of_pods} =    Search Pod    namespace=${APPLICATIONS_NAMESPACE}    pod_start_with=rhods-dashboard
+    ${list_of_pods} =    Search Pod    namespace=${APPLICATIONS_NAMESPACE}    pod_regex=${DASHBOARD_APP_NAME}


github-actions · 2024-03-19T10:18:03Z

Robot Results

✅ Passed	❌ Failed	⏭️ Skipped	Total	Pass %
448	0	0	448	100

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

@@ -67,6 +67,7 @@
    Set Global Variable    ${OPERATOR_NAMESPACE}    openshift-operators
    Set Global Variable    ${NOTEBOOKS_NAMESPACE}    opendatahub
  END
+  Set Global Variable    ${DASHBOARD_APP_NAME}    ${PRODUCT.lower()}-dashboard


kornys

comments

~/.kube/config

ods_ci/tests/Resources/Page/LoginPage.robot

ods_ci/tests/Resources/Common.robot

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettingsRuntimes.resource

ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot

ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot

@@ -49,7 +49,7 @@
 Maybe Skip Tour
    [Documentation]    If we are in the openshift web console, maybe skip the first time
    ...    tour popup given to users, otherwise RETURN.
-    ${should_cont} =    Is Current Domain Equal To    https://console-openshift-console
+    ${should_cont} =    Does Current Sub Domain Start With    https://console-openshift-console


Includes: - Change `Is Current Domain Equal To` KW to support either "oauth-openshift" or "oauth" Subdomain. - Add `Wait For Dashboard Page Title` KW to get page title that could reside inside h1 child element. - `Search Pod` KW returns a list of pods match regular expression. (It is required when installing ODH, and verifying Dashboard pods that includes "dashboard", instead of "rhods-dashboard"). - Setting global var $DASHBOARD_APP_NAME according to product, for those dependent KWs that uses app = "odh-dashboard" or "rhods-dashboard". Signed-off-by: manosnoam <[email protected]>

Signed-off-by: manosnoam <[email protected]>

- Fix `Upload Serving Runtime Template` in ODHDashboard Settings - Verify that the color of the Jupyter Card code block is gray Signed-off-by: manosnoam <[email protected]> Verify that the color of the Jupyter Card code block is gray Signed-off-by: manosnoam <[email protected]>

Also fix Camel-Case of `Wait for RHODS Dashboard to Load` Signed-off-by: manosnoam <[email protected]>

sonarcloud · 2024-03-22T09:54:08Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

@@ -97,21 +98,25 @@
    Click Element  xpath://a[.="Log out"]
    Wait Until Page Contains  Log in with OpenShift

-Wait for RHODS Dashboard to Load
+Wait For RHODS Dashboard To Load


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

+    [Documentation]    Wait until the visible title (h1) of the current Dashboard page is '${page_title}'
+    [Arguments]  ${page_title}    ${timeout}=10s
+    ${page_title_element}=    Set Variable    //*[@data-testid="app-page-title"]
+    Wait Until Element is Visible    ${page_title_element}    timeout=${timeout}


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

-    Execute Javascript    arguments[0].click();     ARGUMENTS    ${element}
-    ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]
+    Click Element    ${card_locator}
+        ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

-    Execute Javascript    arguments[0].click();     ARGUMENTS    ${element}
-    ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]
+    Click Element    ${card_locator}
+        ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboard.robot

-    Execute Javascript    arguments[0].click();     ARGUMENTS    ${element}
-    ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]
+    Click Element    ${card_locator}
+        ${status}=  Run Keyword and Return Status  Wait Until Page Contains Element    xpath://div[contains(@class,'pf-v5-c-drawer__panel-main')]


manosnoam · 2024-03-22T10:02:02Z

we should merge this with squashing the commits, unless you update this discrepancy in the commit history properly (which I would prefer, though).

Thanks @jstourac , I squashed the commits.

jstourac · 2024-03-22T10:08:12Z

Thanks @jstourac , I squashed the commits.

JFTR - the commits aren't squashed (and I like it since they are well structured and thus can be merged as they are from my point of view). What was squashed/fixed-up was the change discrepancy - inadvertent change in first commit was fixed in a different commit - now this has been removed from the original commit directly and thus makes the commit history clean. Thank you.

change has been made

bdattoma · 2024-03-22T15:48:33Z

Thanks @jstourac , I squashed the commits.

JFTR - the commits aren't squashed (and I like it since they are well structured and thus can be merged as they are from my point of view). What was squashed/fixed-up was the change discrepancy - inadvertent change in first commit was fixed in a different commit - now this has been removed from the original commit directly and thus makes the commit history clean. Thank you.

I'd vote for squashing anyway, it makes the overall history cleaner, if everybody starts merging new 10 commits or more it becomes difficult.
Moreover, I believe that when PR are so big, you cannot just revert a commit without the risk of missing dependent code. Hence if there is a regression introduced by a such PR, it would be easier to revert the single squashed commit and raise the PR again with the fix

jiridanek · 2024-03-22T16:07:20Z

I guess I wouldn't squash. The individual commits have meaningful commit messages, so it would help with git blames and later investigations to keep them separate.

bdattoma · 2024-03-22T16:10:09Z

I guess I wouldn't squash. The individual commits have meaningful commit messages, so it would help with git blames and later investigations to keep them separate.

in case of regression it can become a hunt for the commits you need to revert. Even squashing you can see who edited a line with git blame. What's the problem?

jiridanek · 2024-03-22T16:23:28Z

GitHub webui gives you option to revert entire PR. And I guess I now see yet another good use of merging with merge commits.

In git blame, I like to be able to go to commit message and see whats the message associated with each change. Usually it's obvious but sometimes it isn't and then it's useful info to have.

manosnoam · 2024-03-24T08:46:16Z

I will squash the PR, since we can still see all the commits within it.
Take a look at another squashed commit: 8910a4d - You can click on the PR #1235 link in it and see all the squashed commits it includes.

manosnoam added the do not merge Do not merge this yet please label Mar 19, 2024

github-advanced-security bot found potential problems Mar 19, 2024

View reviewed changes

manosnoam added enhancements Bugfixes, enhancements, refactoring, ... in tests or libraries (PR will be listed in release-notes) and removed do not merge Do not merge this yet please labels Mar 21, 2024

manosnoam requested review from jgarciao and bdattoma March 21, 2024 06:52

manosnoam added the verified This PR has been tested with Jenkins label Mar 21, 2024

manosnoam force-pushed the odh_dash400 branch from 18e6b66 to 6eb31a7 Compare March 21, 2024 07:09

kornys previously requested changes Mar 21, 2024

View reviewed changes

~/.kube/config Outdated Show resolved Hide resolved

bdattoma reviewed Mar 21, 2024

View reviewed changes

ods_ci/tests/Resources/Page/LoginPage.robot Outdated Show resolved Hide resolved

bdattoma reviewed Mar 21, 2024

View reviewed changes

ods_ci/tests/Resources/Common.robot Outdated Show resolved Hide resolved

bdattoma reviewed Mar 21, 2024

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettingsRuntimes.resource Show resolved Hide resolved

bdattoma reviewed Mar 21, 2024

View reviewed changes

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettingsRuntimes.resource Show resolved Hide resolved

bdattoma reviewed Mar 21, 2024

View reviewed changes

ods_ci/tests/Tests/400__ods_dashboard/400__ods_dashboard.robot Show resolved Hide resolved

jiridanek modified the milestones: 2.10.0, 2.8.1 Mar 21, 2024

manosnoam force-pushed the odh_dash400 branch 2 times, most recently from 10ec841 to 5d10308 Compare March 21, 2024 14:01

github-advanced-security bot found potential problems Mar 21, 2024

View reviewed changes

manosnoam requested review from kornys, bdattoma and jiridanek March 21, 2024 14:06

manosnoam force-pushed the odh_dash400 branch from 5d10308 to 1f54502 Compare March 21, 2024 14:12

jstourac previously approved these changes Mar 21, 2024

View reviewed changes

manosnoam dismissed jstourac’s stale review via 630e4ca March 21, 2024 15:49

manosnoam force-pushed the odh_dash400 branch from 1f54502 to 630e4ca Compare March 21, 2024 15:49

bdattoma previously approved these changes Mar 22, 2024

View reviewed changes

manosnoam added 10 commits March 22, 2024 08:49

Fix Verify RHODS Display Name and Version for ODH

b442bd8

Signed-off-by: manosnoam <[email protected]>

Verify Service Is Not Enabled should not wait long (app isn't present)

81a5b2e

Signed-off-by: manosnoam <[email protected]>

Fix Verify Favorite Resource Cards test and Sort Resources By KW

f54cd66

Signed-off-by: manosnoam <[email protected]>

Fix Verify Favorite Resource Cards Test

e070449

Signed-off-by: manosnoam <[email protected]>

Fix Verify RHODS Display Name and Version test

e18613d

Signed-off-by: manosnoam <[email protected]>

Update $DASHBOARD_APP_NAME in Verify RHODS Installation for ODH

4287edf

Signed-off-by: manosnoam <[email protected]>

Remove Test Billing Metric test (5+ minutes) from Smoke

324bd82

Signed-off-by: manosnoam <[email protected]>

Update DEFAULT_NOTEBOOK_VER=2024.1 and PREVIOUS_NOTEBOOK_VER=2023.2

cdf4b7c

Signed-off-by: manosnoam <[email protected]>

manosnoam dismissed stale reviews from bdattoma and jstourac via d15425b March 22, 2024 08:57

manosnoam force-pushed the odh_dash400 branch from 561e7cb to d15425b Compare March 22, 2024 08:57

jstourac previously approved these changes Mar 22, 2024

View reviewed changes

Wait For RHODS Dashboard To Load uses Wait For Dashboard Page Title

5d90fb4

Also fix Camel-Case of `Wait for RHODS Dashboard to Load` Signed-off-by: manosnoam <[email protected]>

manosnoam dismissed jstourac’s stale review via 5d90fb4 March 22, 2024 09:53

github-advanced-security bot found potential problems Mar 22, 2024

View reviewed changes

jstourac approved these changes Mar 22, 2024

View reviewed changes

jiridanek approved these changes Mar 22, 2024

View reviewed changes

manosnoam merged commit a46b289 into red-hat-data-services:master Mar 24, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Dashboard Tests for ODH and RHOAI 2.9 #1308

Fix Dashboard Tests for ODH and RHOAI 2.9 #1308

manosnoam commented Mar 19, 2024 •

edited

Loading

github-actions bot commented Mar 19, 2024

kornys left a comment

sonarcloud bot commented Mar 22, 2024

manosnoam commented Mar 22, 2024

jstourac commented Mar 22, 2024 •

edited

Loading

bdattoma commented Mar 22, 2024

jiridanek commented Mar 22, 2024

bdattoma commented Mar 22, 2024

jiridanek commented Mar 22, 2024

manosnoam commented Mar 24, 2024

Fix Dashboard Tests for ODH and RHOAI 2.9 #1308

Fix Dashboard Tests for ODH and RHOAI 2.9 #1308

Conversation

manosnoam commented Mar 19, 2024 • edited Loading

github-actions bot commented Mar 19, 2024

Robot Results

kornys left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Mar 22, 2024

Quality Gate passed

manosnoam commented Mar 22, 2024

jstourac commented Mar 22, 2024 • edited Loading

bdattoma commented Mar 22, 2024

jiridanek commented Mar 22, 2024

bdattoma commented Mar 22, 2024

jiridanek commented Mar 22, 2024

manosnoam commented Mar 24, 2024

manosnoam commented Mar 19, 2024 •

edited

Loading

jstourac commented Mar 22, 2024 •

edited

Loading