Fix model mesh tests and update runtime images #2060

rnetser · 2024-11-21T17:54:21Z

verified via jenkins job/devops/job/rhoai-test-flow/1779/robot/ - failues are not related to this PR and will be fixed in seperate PRs
for the images - tested against disconnected env

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

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

+                Page Should Contain Element    xpath://span[contains(., "${runtime}")]
+                ${selected}=    Run Keyword And Return Status
+                ...    Click Element    xpath://span[contains(., "${runtime}")]
+                IF  ${selected}==${TRUE}    BREAK


ods_ci/tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm.robot

...erving/1010__model_serving_triton_on_modelmesh/1010__model_serving_triton_on_modelmesh.robot

@@ -54,7 +54,7 @@
    Recreate S3 Data Connection    project_title=${PRJ_TITLE}    dc_name=model-serving-connection
    ...            aws_access_key=${S3.AWS_ACCESS_KEY_ID}    aws_secret_access=${S3.AWS_SECRET_ACCESS_KEY}
    ...            aws_bucket_name=ods-ci-s3
-    Create Model Server    token=${TRUE}    runtime=${ONNX_RUNTIME_NAME}    server_name=${ONNX_RUNTIME_NAME}    existing_server=${TRUE}
+    Create Model Server    token=${TRUE}    runtime=${ONNX_RUNTIME_NAME}    server_name=${ONNX_RUNTIME_NAME}    existing_server=${FALSE}


...erving/1010__model_serving_triton_on_modelmesh/1010__model_serving_triton_on_modelmesh.robot

@@ -130,7 +130,7 @@
    Recreate S3 Data Connection    project_title=${PRJ_TITLE}    dc_name=model-serving-connection
    ...            aws_access_key=${S3.AWS_ACCESS_KEY_ID}    aws_secret_access=${S3.AWS_SECRET_ACCESS_KEY}
    ...            aws_bucket_name=ods-ci-s3
-    Create Model Server    token=${TRUE}    runtime=${ONNX_RUNTIME_NAME}    server_name=${ONNX_RUNTIME_NAME}    existing_server=${TRUE}
+    Create Model Server    token=${TRUE}    runtime=${ONNX_RUNTIME_NAME}    server_name=${ONNX_RUNTIME_NAME}    existing_server=${FALSE}


into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

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

@@ -226,7 +226,7 @@
    [Arguments]    ${model_name}
    # TODO: Open model serving home page if needed?
    # Click on Inference Endpoints link
-    ${endpoint_link}=    Set Variable    //a[@data-testid="metrics-link-test-model" and text()="${model_name}"]/ancestor::tr//td//button[@data-testid="internal-external-service-button"]
+    ${endpoint_link}=    Set Variable    //a[contains(@data-testid, 'metrics-link')][text() = '${model_name}']/ancestor::tr//td//button[@data-testid="internal-external-service-button"]


ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

    ...    existing_data_connection=${TRUE}    data_connection_name=model-serving-connection
    ...    model_path=inception_resnet_v2.pb
    ${runtime_pod_name}=    Replace String Using Regexp    string=${RUNTIME_NAME}    pattern=\\s    replace_with=-
    ${runtime_pod_name}=    Convert To Lower Case    ${runtime_pod_name}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Serving Service
+    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}    project_name=${namespace}


ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

    ...    existing_data_connection=${TRUE}    data_connection_name=model-serving-connection
    ...    model_path=inception_resnet_v2.pb
    ${runtime_pod_name}=    Replace String Using Regexp    string=${RUNTIME_NAME}    pattern=\\s    replace_with=-
    ${runtime_pod_name}=    Convert To Lower Case    ${runtime_pod_name}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Serving Service
+    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}    project_name=${namespace}


ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

    Verify Model Status    ${MODEL_NAME}    success
    Set Suite Variable    ${MODEL_CREATED}    ${TRUE}
    ${url}=    Get Model Route Via UI    ${MODEL_NAME}
-    ${status_code}    ${response_text}=    Send Random Inference Request     endpoint=${url}    name=input
+    ${status_code}    ${response_text}=    Send Random Inference Request     endpoint=${url}    name=input:0


ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

    ...    existing_data_connection=${TRUE}    data_connection_name=model-serving-connection
    ...    model_path=inception_resnet_v2.pb
    ${runtime_pod_name}=    Replace String Using Regexp    string=${RUNTIME_NAME}    pattern=\\s    replace_with=-
    ${runtime_pod_name}=    Convert To Lower Case    ${runtime_pod_name}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Serving Service
+    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}    project_name=${namespace}


ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

    ...    existing_data_connection=${TRUE}    data_connection_name=model-serving-connection
    ...    model_path=inception_resnet_v2.pb
    ${runtime_pod_name}=    Replace String Using Regexp    string=${RUNTIME_NAME}    pattern=\\s    replace_with=-
    ${runtime_pod_name}=    Convert To Lower Case    ${runtime_pod_name}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}
-    Wait Until Keyword Succeeds    5 min  10 sec  Verify Serving Service
+    Wait Until Keyword Succeeds    5 min  10 sec  Verify Openvino Deployment    runtime_name=${RUNTIME_POD_NAME}    project_name=${namespace}


rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

ods_ci/tests/Tests/1000__model_serving/1005__model_serving_ovms_on_kserve.robot

@@ -64,7 +64,7 @@
    Verify Model Status    ${MODEL_NAME}    success
    Set Suite Variable    ${MODEL_CREATED}    ${TRUE}
    ${url}=    Get Model Route Via UI    ${MODEL_NAME}
-    ${status_code}    ${response_text}=    Send Random Inference Request     endpoint=${url}    name=input
+    ${status_code}    ${response_text}=    Send Random Inference Request     endpoint=${url}    name=input:0


ods_ci/tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm.robot

...tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm_models.robot

@@ -1347,9 +1347,9 @@
    [Arguments]    ${gpu_type}
    IF  "${RUNTIME_IMAGE}" == "${EMPTY}"
         IF  "${gpu_type}" == "nvidia"
-            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:167aa05982214c3941afbdde7c5aff6f81040193a0db1dc06a5ad16af0a8780e
+            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:c86ff1e89c86bc9821b75d7f2bbc170b3c13e3ccf538bf543b1110f23e056316


...tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm_models.robot

@@ -1347,9 +1347,9 @@
    [Arguments]    ${gpu_type}
    IF  "${RUNTIME_IMAGE}" == "${EMPTY}"
         IF  "${gpu_type}" == "nvidia"
-            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:167aa05982214c3941afbdde7c5aff6f81040193a0db1dc06a5ad16af0a8780e
+            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:c86ff1e89c86bc9821b75d7f2bbc170b3c13e3ccf538bf543b1110f23e056316


...tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm_models.robot

         ELSE IF    "${gpu_type}" == "amd"
-            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:1db9fc11f3cac723dee8c4de71fd36aafc94c6ff4d9f51cb785a6f4461f027af
+            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:10f09eeca822ebe77e127aad7eca2571f859a5536a6023a1baffc6764bcadc6e


...tests/Tests/1000__model_serving/1007__model_serving_llm/1007__model_serving_llm_models.robot

         ELSE IF    "${gpu_type}" == "amd"
-            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:1db9fc11f3cac723dee8c4de71fd36aafc94c6ff4d9f51cb785a6f4461f027af
+            Set Test Variable    ${runtime_image}    quay.io/modh/vllm@sha256:10f09eeca822ebe77e127aad7eca2571f859a5536a6023a1baffc6764bcadc6e


ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

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

@@ -426,6 +427,7 @@
            Sleep    1s
        END
        Switch Model Serving Project    project_name=All projects
+        @{projects}=    Get WebElements    xpath://table/tbody/tr/td[@data-label="Project"]


github-actions · 2024-11-26T08:54:09Z

Robot Results

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

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot

@@ -68,7 +68,7 @@
    ...    token_auth=${TRUE}    token=${first_token}
    Run Keyword And Warn On Failure    Should Contain    ${inf_out}    Log in with OpenShift
    [Teardown]    Run Keywords    Run Keyword If Test Failed    Get Kserve Events And Logs
-    ...    model_name=${MODEL_NAME}    project_title=${PRJ_TITLE}    AND    Clean All Models Of Current User
+    ...    model_name=${MODEL_NAME}    project_title=${PRJ_TITLE}    AND    model_name=${SECOND_MODEL_NAME}    project_title=${PRJ_TITLE}


ods_ci/tests/Tests/1000__model_serving/1008_model_serving_cross_auth.robot

@@ -68,7 +68,7 @@
    ...    token_auth=${TRUE}    token=${first_token}
    Run Keyword And Warn On Failure    Should Contain    ${inf_out}    Log in with OpenShift
    [Teardown]    Run Keywords    Run Keyword If Test Failed    Get Kserve Events And Logs
-    ...    model_name=${MODEL_NAME}    project_title=${PRJ_TITLE}    AND    Clean All Models Of Current User
+    ...    model_name=${MODEL_NAME}    project_title=${PRJ_TITLE}    AND    model_name=${SECOND_MODEL_NAME}    project_title=${PRJ_TITLE}


tarukumar

overall looks good to me. Please run the test from jenkins as well

ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

sonarqubecloud · 2024-11-27T11:53:19Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

* Update model mesh deploymenet from ui rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * add raw and serverless rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * add raw and serverless rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * update images rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests and code rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * use cli project deletion rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * use cli project deletion rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * remove parenthasis rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED Co-authored-by: Ruth Netser <[email protected]>

…#2060) * Update model mesh deploymenet from ui rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * add raw and serverless rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * add raw and serverless rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * update images rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * fix tests and code rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * use cli project deletion rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * use cli project deletion rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED * remove parenthasis rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rnetser added 3 commits November 21, 2024 14:53

Update model mesh deploymenet from ui

6d7c959

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

add raw and serverless

7e43475

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

add raw and serverless

9c24c8a

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

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

View reviewed changes

rnetser changed the title ~~[ui] Fix model mesh tests and add kserve test~~ [wip][ui] Fix model mesh tests and add kserve test Nov 21, 2024

rnetser added 3 commits November 24, 2024 11:42

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

49252a9

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

fix tests

99b0b85

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

fix tests

17158de

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems Nov 24, 2024

View reviewed changes

rnetser added 4 commits November 24, 2024 18:56

fix tests

42b2044

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

d21dbb6

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

update images

3a024e6

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

a192ba2

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems Nov 25, 2024

View reviewed changes

rnetser changed the title ~~[wip][ui] Fix model mesh tests and add kserve test~~ [wip][ui] Fix model mesh tests and update runtime images Nov 25, 2024

tarukumar reviewed Nov 26, 2024

View reviewed changes

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

rnetser added 2 commits November 26, 2024 08:55

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

dc3d4dd

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

fix tests and code

80996e2

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems Nov 26, 2024

View reviewed changes

rnetser added 3 commits November 26, 2024 14:49

use cli project deletion

c2817c1

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

76918f8

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

use cli project deletion

08a3d51

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

github-advanced-security bot found potential problems Nov 26, 2024

View reviewed changes

tarukumar self-requested a review November 26, 2024 15:24

tarukumar previously approved these changes Nov 26, 2024

View reviewed changes

tarukumar reviewed Nov 27, 2024

View reviewed changes

ods_ci/tests/Tests/1000__model_serving/1001__model_serving_modelmesh.robot Outdated Show resolved Hide resolved

tarukumar self-requested a review November 27, 2024 05:35

rnetser added 2 commits November 27, 2024 11:28

remove parenthasis

fdf57cc

rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

4396dd9

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

rnetser dismissed tarukumar’s stale review via 4396dd9 November 27, 2024 09:28

rnetser changed the title ~~[wip][ui] Fix model mesh tests and update runtime images~~ Fix model mesh tests and update runtime images Nov 27, 2024

rnetser requested a review from mwaykole November 27, 2024 09:45

mwaykole approved these changes Nov 27, 2024

View reviewed changes

Merge branch 'master' of https://github.com/red-hat-data-services/ods-ci

ee91768

into fix-model-mesh rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED

tarukumar approved these changes Nov 27, 2024

View reviewed changes

tarukumar merged commit 8cfdd75 into red-hat-data-services:master Nov 27, 2024
8 checks passed

rnetser deleted the fix-model-mesh branch November 27, 2024 13:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix model mesh tests and update runtime images #2060

Fix model mesh tests and update runtime images #2060

rnetser commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 26, 2024 •

edited

Loading

tarukumar left a comment

sonarqubecloud bot commented Nov 27, 2024

Fix model mesh tests and update runtime images #2060

Fix model mesh tests and update runtime images #2060

Conversation

rnetser commented Nov 21, 2024 • edited Loading

github-actions bot commented Nov 26, 2024 • edited Loading

Robot Results

tarukumar left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Nov 27, 2024

Quality Gate passed

rnetser commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 26, 2024 •

edited

Loading