Fix test some LLM UI tests from Smoke (#1170)

* remain on DSProjects page * restore prev version and apply new fix * fix robocop alert * add screenshot for debug * tentative fix metrics test * fix robocop alert
red-hat-data-services · Feb 1, 2024 · 9346076 · 9346076
1 parent c02c74d
commit 9346076
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ods_ci/tests/Resources/Common.robot b/ods_ci/tests/Resources/Common.robot
@@ -13,8 +13,8 @@ Resource  RHOSi.resource
 
 *** Variables ***
 @{DEFAULT_CHARS_TO_ESCAPE}=    :    /    .
-${MONITORING_CONFIG_FILEPATH}=       ods_ci/tests/Resources/Files/uwm_cm_conf.yaml
-${UWM_CONFIG_FILEPATH}=              ods_ci/tests/Resources/Files/uwm_cm_enable.yaml
+${UWM_CONFIG_FILEPATH}=       ods_ci/tests/Resources/Files/uwm_cm_conf.yaml
+${UWM_ENABLE_FILEPATH}=       ods_ci/tests/Resources/Files/uwm_cm_enable.yaml
 
 
 *** Keywords ***
@@ -433,7 +433,7 @@ Skip If Component Is Not Enabled
 
 Enable User Workload Monitoring
     [Documentation]    Enable User Workload Monitoring for the cluster for user-defined-projects
-    ${return_code}    ${output}    Run And Return Rc And Output   oc apply -f ${MONITORING_CONFIG_FILEPATH}
+    ${return_code}    ${output}    Run And Return Rc And Output   oc apply -f ${UWM_ENABLE_FILEPATH}
     Log To Console    ${output}
     Should Be Equal As Integers    ${return_code}     0   msg=Error while applying the provided file
 

diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource
@@ -487,6 +487,7 @@ Try Opening Create Server
     FOR    ${try}    IN RANGE    0    ${retries}
         ${status}=    Run Keyword And Return Status    Page Should Contain    Select a project
         IF    ${status}
+            Capture Page Screenshot
             Click Button    Select a project
             RETURN
         ELSE
@@ -505,11 +506,9 @@ Set Up Project
     Open Model Serving Home Page
     IF    ${single_prj}
         Try Opening Create Server
-        Wait for RHODS Dashboard to Load    wait_for_cards=${FALSE}    expected_page=Data Science Projects
-    ELSE
-        Open Data Science Projects Home Page
-        Wait for RHODS Dashboard to Load    wait_for_cards=${FALSE}    expected_page=Data Science Projects
     END
+    Open Data Science Projects Home Page
+    Wait For RHODS Dashboard To Load    wait_for_cards=${FALSE}    expected_page=Data Science Projects
     Create Data Science Project    title=${namespace}    description=kserve test project
     Create S3 Data Connection    project_title=${namespace}    dc_name=${dc_name}
     ...            aws_access_key=${S3.AWS_ACCESS_KEY_ID}    aws_secret_access=${S3.AWS_SECRET_ACCESS_KEY}

diff --git a/...400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot b/...400__ods_dashboard/420__model_serving/LLMs/422__model_serving_llm_other_runtimes_UI.robot
@@ -23,7 +23,12 @@ Verify Non Admin Can Serve And Query A Model Using The UI  # robocop: disable
     [Documentation]    Basic tests leveraging on a non-admin user for preparing, deploying and querying a LLM model
     ...                using Single-model platform and TGIS Standalone runtime.
     [Tags]    Sanity    Tier1    ODS-2611
-    [Setup]    Run    git clone https://github.com/IBM/text-generation-inference/
+    [Setup]    Run Keywords
+    ...    Run    git clone https://github.com/IBM/text-generation-inference/
+    ...    AND
+    ...    Configure User Workload Monitoring
+    ...    AND
+    ...    Enable User Workload Monitoring
     ${test_namespace}=    Set Variable     ${TEST_NS}
     ${model_name}=    Set Variable    flan-t5-small-hf
     Deploy Kserve Model Via UI    model_name=${model_name}

diff --git a/...sts/400__ods_dashboard/420__model_serving/LLMs/422_model_serving_llm_other_runtimes.robot b/...sts/400__ods_dashboard/420__model_serving/LLMs/422_model_serving_llm_other_runtimes.robot
@@ -24,6 +24,7 @@ Verify User Can Serve And Query A Model With TGIS-Standalone Runtime (gRPC)
     ...                using Kserve and TGIS standalone runtime
     [Tags]    Sanity    Tier1    ODS-2607
     [Setup]    Run Keywords    Set Project And Runtime    namespace=${TEST_NS_TGIS}    runtime=${TGIS_RUNTIME_NAME}
+    ...        enable_metrics=${TRUE}
     ...        AND
     ...        Run    git clone https://github.com/IBM/text-generation-inference/
     ${test_namespace}=    Set Variable     ${TEST_NS_TGIS}