Merge remote-tracking branch 'upstream/main' into mariadb-tests

dbasunag · dbasunag · commit b49f5ccb1b1b · 2025-08-11T15:21:44.000-04:00
diff --git a/tests/model_explainability/conftest.py b/tests/model_explainability/conftest.py
@@ -161,7 +161,7 @@ def vllm_runtime(
         template_name=RuntimeTemplates.VLLM_CUDA,
         deployment_type=KServeDeploymentType.RAW_DEPLOYMENT,
         runtime_image="quay.io/rh-aiservices-bu/vllm-cpu-openai-ubi9"
-        "@sha256:d680ff8becb6bbaf83dfee7b2d9b8a2beb130db7fd5aa7f9a6d8286a58cebbfd",
+        "@sha256:ada6b3ba98829eb81ae4f89364d9b431c0222671eafb9a04aa16f31628536af2",
         containers={
             "kserve-container": {
                 "args": [
diff --git a/tests/model_explainability/lm_eval/conftest.py b/tests/model_explainability/lm_eval/conftest.py
@@ -382,7 +382,7 @@ def lmeval_minio_copy_pod(
         ],
         wait_for_resource=True,
     ) as pod:
-        pod.wait_for_status(status=Pod.Status.SUCCEEDED)
+        pod.wait_for_status(status=Pod.Status.SUCCEEDED, timeout=600)
         yield pod
 
 
diff --git a/tests/model_registry/python_client/test_model_registry_creation.py b/tests/model_registry/python_client/test_model_registry_creation.py
@@ -111,6 +111,9 @@ def test_model_registry_pod_log_mlmd_removal(
             pytest.param(
                 "readyz/isDirty",
             ),
+            pytest.param(
+                "readyz/health",
+            ),
         ],
     )
     def test_model_registry_endpoint_response(
diff --git a/tests/model_serving/model_server/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py b/tests/model_serving/model_server/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py
@@ -32,7 +32,7 @@
     [
         pytest.param(
             {"default-deployment-mode": KServeDeploymentType.SERVERLESS},
-            {"name": "dsc-serverless"},
+            {"name": "test-dsc-serverless"},
             RUNTIME_PARAMS,
             {
                 **{"name": f"{ModelFormat.OPENVINO}-{KServeDeploymentType.SERVERLESS.lower()}"},
diff --git a/tests/model_serving/model_server/components/model_mesh_kserve_co_exist/test_model_mesh_kserve_inference_co_exist.py b/tests/model_serving/model_server/components/model_mesh_kserve_co_exist/test_model_mesh_kserve_inference_co_exist.py
@@ -22,7 +22,7 @@
     "http_s3_openvino_model_mesh_inference_service",
     [
         pytest.param(
-            {"name": "serverless-model-mesh-openvino", "modelmesh-enabled": True},
+            {"name": "test-mm-openvino", "modelmesh-enabled": True},
             KSERVE_RUNTIME_PARAMS,
             SERVERLESS_ISVC_PARAMS,
             MODELMESH_ISVC_PARAMS,
@@ -61,7 +61,7 @@ def test_model_mesh_openvino_created_after_serverless_in_namespace_rest_inferenc
     "ovms_kserve_inference_service, ",
     [
         pytest.param(
-            {"name": "model-mesh-serverless-openvino", "modelmesh-enabled": True},
+            {"name": "test-mm-openvino", "modelmesh-enabled": True},
             MODELMESH_ISVC_PARAMS,
             KSERVE_RUNTIME_PARAMS,
             SERVERLESS_ISVC_PARAMS,
diff --git a/tests/model_serving/model_server/components/test_custom_resources.py b/tests/model_serving/model_server/components/test_custom_resources.py
@@ -39,7 +39,7 @@ def wait_for_isvc_model_status(isvc: InferenceService, target_model_state: str,
     "unprivileged_model_namespace, serving_runtime_from_template, invalid_s3_models_inference_service",
     [
         pytest.param(
-            {"name": "non-existing-models-storage-path"},
+            {"name": "test-non-existing-models-path"},
             {
                 "name": f"{Protocols.HTTP}-{ModelInferenceRuntime.CAIKIT_TGIS_RUNTIME}",
                 "template-name": RuntimeTemplates.CAIKIT_TGIS_SERVING,
diff --git a/tests/model_serving/model_server/inference_service_configuration/test_isvc_env_vars_updates.py b/tests/model_serving/model_server/inference_service_configuration/test_isvc_env_vars_updates.py
@@ -32,12 +32,12 @@
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_kserve_inference_service",
     [
         pytest.param(
-            {"name": "raw-env-update"},
+            {"name": "test-raw-update"},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             RAW_DEPLOYMENT_ISVC_CONFIG,
         ),
         pytest.param(
-            {"name": "raw-multi-env-update"},
+            {"name": "test-raw-multi-update"},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             {
                 **RAW_DEPLOYMENT_ISVC_CONFIG,
@@ -62,12 +62,12 @@ def test_raw_remove_isvc_env_vars(self, removed_isvc_env_vars):
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_kserve_inference_service",
     [
         pytest.param(
-            {"name": "serverless-env-update"},
+            {"name": "test-serverless-update"},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             SERVERLESS_DEPLOYMENT_ISVC_CONFIG,
         ),
         pytest.param(
-            {"name": "serverless-multi-env-update"},
+            {"name": "test-adv-multi-update"},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             {
                 **SERVERLESS_DEPLOYMENT_ISVC_CONFIG,
diff --git a/tests/model_serving/model_server/inference_service_configuration/test_isvc_pull_secret_updates.py b/tests/model_serving/model_server/inference_service_configuration/test_isvc_pull_secret_updates.py
@@ -5,14 +5,14 @@
     ORIGINAL_PULL_SECRET,
     UPDATED_PULL_SECRET,
 )
-from utilities.constants import ModelFormat, ModelName, RuntimeTemplates
+from utilities.constants import ModelName, RuntimeTemplates
 
 
 @pytest.mark.parametrize(
     "unprivileged_model_namespace, serving_runtime_from_template, model_car_raw_inference_service_with_pull_secret",
     [
         pytest.param(
-            {"name": f"{ModelFormat.OPENVINO}-model-car"},
+            {"name": "test-pull-secret-modelcar"},
             {
                 "name": f"{ModelName.MNIST}-runtime",
                 "template-name": RuntimeTemplates.OVMS_KSERVE,
diff --git a/tests/model_serving/model_server/inference_service_configuration/test_isvc_replicas_update.py b/tests/model_serving/model_server/inference_service_configuration/test_isvc_replicas_update.py
@@ -27,7 +27,7 @@
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_kserve_inference_service",
     [
         pytest.param(
-            {"name": "raw-isvc-replicas"},
+            {"name": "test-raw-isvc-replicas"},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             {
                 **BASE_ISVC_CONFIG,
diff --git a/tests/model_serving/model_server/keda/test_isvc_keda_scaling_cpu.py b/tests/model_serving/model_server/keda/test_isvc_keda_scaling_cpu.py
@@ -25,7 +25,7 @@
 INITIAL_POD_COUNT = 1
 FINAL_POD_COUNT = 5
 
-OVMS_MODEL_NAMESPACE = "ovms-keda"
+OVMS_MODEL_NAMESPACE = "test-ovms-keda"
 OVMS_MODEL_NAME = "onnx-raw"
 OVMS_METRICS_QUERY = (
     f'sum(sum_over_time(ovms_requests_success{{namespace="{OVMS_MODEL_NAMESPACE}", name="{OVMS_MODEL_NAME}"}}[5m]))'
@@ -39,7 +39,7 @@
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, stressed_ovms_keda_inference_service",
     [
         pytest.param(
-            {"name": "ovms-keda"},
+            {"name": OVMS_MODEL_NAMESPACE},
             RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,
             {
                 "name": ModelFormat.ONNX,
diff --git a/tests/model_serving/model_server/kueue/test_kueue_isvc_raw.py b/tests/model_serving/model_server/kueue/test_kueue_isvc_raw.py
@@ -18,7 +18,7 @@
     pytest.mark.smoke,
 ]
 
-NAMESPACE_NAME = "kueue-isvc-raw-test"
+NAMESPACE_NAME = "test-kueue-isvc-raw"
 LOCAL_QUEUE_NAME = "local-queue-raw"
 CLUSTER_QUEUE_NAME = "cluster-queue-raw"
 RESOURCE_FLAVOR_NAME = "default-flavor-raw"
diff --git a/tests/model_serving/model_server/kueue/test_kueue_isvc_serverless.py b/tests/model_serving/model_server/kueue/test_kueue_isvc_serverless.py
@@ -19,7 +19,7 @@
     pytest.mark.smoke,
 ]
 
-NAMESPACE_NAME = "kueue-isvc-serverless-test"
+NAMESPACE_NAME = "test-kueue-isvc-serverless"
 LOCAL_QUEUE_NAME = "local-queue-serverless"
 CLUSTER_QUEUE_NAME = "cluster-queue-serverless"
 RESOURCE_FLAVOR_NAME = "default-flavor-serverless"
diff --git a/tests/model_serving/model_server/metrics/test_model_metrics.py b/tests/model_serving/model_server/metrics/test_model_metrics.py
@@ -28,7 +28,7 @@
     "unprivileged_model_namespace, serving_runtime_from_template, s3_models_inference_service",
     [
         pytest.param(
-            {"name": "kserve-tgis-metrics"},
+            {"name": "test-kserve-tgis-metrics"},
             {
                 "name": f"{Protocols.HTTP}-{ModelInferenceRuntime.CAIKIT_TGIS_RUNTIME}",
                 "template-name": RuntimeTemplates.CAIKIT_TGIS_SERVING,
diff --git a/tests/model_serving/model_server/metrics/test_non_admin_users.py b/tests/model_serving/model_server/metrics/test_non_admin_users.py
@@ -14,7 +14,7 @@
     "unprivileged_model_namespace, unprivileged_s3_caikit_serverless_inference_service",
     [
         pytest.param(
-            {"name": "non-admin-serverless"},
+            {"name": "test-non-admin-serverless"},
             {"model-dir": ModelStoragePath.FLAN_T5_SMALL_CAIKIT},
         )
     ],
@@ -40,7 +40,7 @@ def test_non_admin_deploy_serverless_and_query_metrics(self, unprivileged_s3_cai
     "unprivileged_model_namespace, unprivileged_s3_caikit_raw_inference_service",
     [
         pytest.param(
-            {"name": "non-admin-metrics"},
+            {"name": "test-non-admin-metrics"},
             {"model-dir": ModelStoragePath.FLAN_T5_SMALL_HF},
         )
     ],
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`[`
`33`	`33`	`pytest.param(`
`34`	`34`	`{"default-deployment-mode": KServeDeploymentType.SERVERLESS},`
`35`		`- {"name": "dsc-serverless"},`
	`35`	`+ {"name": "test-dsc-serverless"},`
`36`	`36`	`RUNTIME_PARAMS,`
`37`	`37`	`{`
`38`	`38`	`**{"name": f"{ModelFormat.OPENVINO}-{KServeDeploymentType.SERVERLESS.lower()}"},`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def wait_for_isvc_model_status(isvc: InferenceService, target_model_state: str,`
`39`	`39`	`"unprivileged_model_namespace, serving_runtime_from_template, invalid_s3_models_inference_service",`
`40`	`40`	`[`
`41`	`41`	`pytest.param(`
`42`		`- {"name": "non-existing-models-storage-path"},`
	`42`	`+ {"name": "test-non-existing-models-path"},`
`43`	`43`	`{`
`44`	`44`	`"name": f"{Protocols.HTTP}-{ModelInferenceRuntime.CAIKIT_TGIS_RUNTIME}",`
`45`	`45`	`"template-name": RuntimeTemplates.CAIKIT_TGIS_SERVING,`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,14 @@`
`5`	`5`	`ORIGINAL_PULL_SECRET,`
`6`	`6`	`UPDATED_PULL_SECRET,`
`7`	`7`	`)`
`8`		`-from utilities.constants import ModelFormat, ModelName, RuntimeTemplates`
	`8`	`+from utilities.constants import ModelName, RuntimeTemplates`
`9`	`9`
`10`	`10`
`11`	`11`	`@pytest.mark.parametrize(`
`12`	`12`	`"unprivileged_model_namespace, serving_runtime_from_template, model_car_raw_inference_service_with_pull_secret",`
`13`	`13`	`[`
`14`	`14`	`pytest.param(`
`15`		`- {"name": f"{ModelFormat.OPENVINO}-model-car"},`
	`15`	`+ {"name": "test-pull-secret-modelcar"},`
`16`	`16`	`{`
`17`	`17`	`"name": f"{ModelName.MNIST}-runtime",`
`18`	`18`	`"template-name": RuntimeTemplates.OVMS_KSERVE,`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_kserve_inference_service",`
`28`	`28`	`[`
`29`	`29`	`pytest.param(`
`30`		`- {"name": "raw-isvc-replicas"},`
	`30`	`+ {"name": "test-raw-isvc-replicas"},`
`31`	`31`	`RunTimeConfigs.ONNX_OPSET13_RUNTIME_CONFIG,`
`32`	`32`	`{`
`33`	`33`	`**BASE_ISVC_CONFIG,`