QG refator smoke (reduce time)

mwaykole · mwaykole · commit 7ffe0468c0c2 · 2026-03-11T16:04:26.000+05:30
Signed-off-by: Milind waykole &lt;mwaykole@redhat.com&gt;
diff --git a/tests/model_serving/model_server/kserve/authentication/test_kserve_token_authentication_raw.py b/tests/model_serving/model_server/kserve/authentication/test_kserve_token_authentication_raw.py
@@ -10,7 +10,7 @@
 pytestmark = pytest.mark.usefixtures("valid_aws_config")
 
 
-@pytest.mark.sanity
+@pytest.mark.smoke
 @pytest.mark.rawdeployment
 @pytest.mark.parametrize(
     "unprivileged_model_namespace, http_s3_ovms_raw_inference_service",
@@ -48,7 +48,7 @@ def test_disabled_raw_model_authentication(self, patched_remove_raw_authenticati
             use_default_query=True,
         )
 
-    @pytest.mark.sanity
+    @pytest.mark.smoke
     @pytest.mark.jira("RHOAIENG-52129", run=False)
     def test_raw_disable_enable_authentication_no_pod_rollout(self, http_s3_ovms_raw_inference_service):
         """Verify no pod rollout when disabling and enabling authentication"""
diff --git a/tests/model_serving/model_server/kserve/authentication/test_non_admin_users.py b/tests/model_serving/model_server/kserve/authentication/test_non_admin_users.py
@@ -18,7 +18,7 @@
     ],
     indirect=True,
 )
-@pytest.mark.sanity
+@pytest.mark.smoke
 @pytest.mark.rawdeployment
 class TestRawUnprivilegedUser:
     @pytest.mark.polarion("ODS-2611")
diff --git a/tests/model_serving/model_server/kserve/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py b/tests/model_serving/model_server/kserve/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py
@@ -14,7 +14,7 @@
 from utilities.inference_utils import Inference
 from utilities.manifests.openvino import OPENVINO_KSERVE_INFERENCE_CONFIG
 
-pytestmark = [pytest.mark.sanity, pytest.mark.rawdeployment]
+pytestmark = [pytest.mark.tier1, pytest.mark.rawdeployment]
 
 RUNTIME_PARAMS = {
     "runtime-name": ModelInferenceRuntime.OPENVINO_KSERVE_RUNTIME,
diff --git a/tests/model_serving/model_server/kserve/components/test_custom_resources.py b/tests/model_serving/model_server/kserve/components/test_custom_resources.py
@@ -11,7 +11,7 @@
 
 LOGGER = get_logger(name=__name__)
 
-pytestmark = [pytest.mark.tier2, pytest.mark.slow, pytest.mark.usefixtures("valid_aws_config")]
+pytestmark = [pytest.mark.tier3, pytest.mark.slow, pytest.mark.usefixtures("valid_aws_config")]
 
 
 def wait_for_isvc_model_status(isvc: InferenceService, target_model_state: str, transition_status: str) -> None:
diff --git a/tests/model_serving/model_server/kserve/components/test_model_serving_components.py b/tests/model_serving/model_server/kserve/components/test_model_serving_components.py
@@ -35,7 +35,7 @@ def component_deployment(
     raise MissingResourceResError(name=deployment.name)
 
 
-@pytest.mark.smoke
+@pytest.mark.tier1
 @pytest.mark.ocp_interop
 @pytest.mark.parametrize(
     "component_deployment",
diff --git a/tests/model_serving/model_server/kserve/inference_graph/test_inference_graph_raw.py b/tests/model_serving/model_server/kserve/inference_graph/test_inference_graph_raw.py
@@ -7,7 +7,7 @@
 
 
 @pytest.mark.rawdeployment
-@pytest.mark.sanity
+@pytest.mark.tier1
 @pytest.mark.parametrize(
     "unprivileged_model_namespace,ovms_kserve_serving_runtime",
     [
@@ -56,7 +56,7 @@ def test_private_inference_graph_raw_deployment(self, dog_breed_inference_graph)
             insecure=True,
         )
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.parametrize(
         "dog_breed_inference_graph",
         [
diff --git a/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_env_vars_updates.py b/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_env_vars_updates.py
@@ -9,7 +9,7 @@
 )
 from utilities.constants import KServeDeploymentType, RunTimeConfigs
 
-pytestmark = [pytest.mark.sanity, pytest.mark.usefixtures("valid_aws_config")]
+pytestmark = [pytest.mark.tier1, pytest.mark.usefixtures("valid_aws_config")]
 
 
 ISVC_ENV_VARS_CONFIG = {
diff --git a/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_pull_secret_updates.py b/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_pull_secret_updates.py
@@ -24,7 +24,7 @@
     indirect=True,
 )
 class TestISVCPullSecretUpdate:
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     def test_initial_pull_secret_set(self, model_car_raw_inference_service_with_pull_secret):
         """Ensure initial pull secret is correctly set in the pod"""
         verify_pull_secret(
diff --git a/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_replicas_update.py b/tests/model_serving/model_server/kserve/inference_service_configuration/test_isvc_replicas_update.py
@@ -18,7 +18,7 @@
 
 LOGGER = get_logger(name=__name__)
 
-pytestmark = [pytest.mark.sanity, pytest.mark.usefixtures("valid_aws_config")]
+pytestmark = [pytest.mark.tier1, pytest.mark.usefixtures("valid_aws_config")]
 
 
 @pytest.mark.rawdeployment
diff --git a/tests/model_serving/model_server/kserve/kueue/test_kueue_isvc_raw.py b/tests/model_serving/model_server/kserve/kueue/test_kueue_isvc_raw.py
@@ -13,10 +13,9 @@
 
 pytestmark = [
     pytest.mark.rawdeployment,
-    pytest.mark.sanity,
+    pytest.mark.tier1,
     pytest.mark.usefixtures("valid_aws_config"),
     pytest.mark.kueue,
-    pytest.mark.smoke,
 ]
 
 NAMESPACE_NAME = "test-kueue-isvc-raw"
diff --git a/tests/model_serving/model_server/kserve/metrics/test_model_metrics.py b/tests/model_serving/model_server/kserve/metrics/test_model_metrics.py
@@ -42,7 +42,7 @@
     indirect=True,
 )
 class TestModelMetrics:
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.polarion("ODS-2555")
     def test_model_metrics_num_success_requests(self, model_car_inference_service, prometheus):
         """Verify number of successful model requests in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
@@ -68,7 +68,7 @@ def test_model_metrics_num_success_requests(self, model_car_inference_service, p
             expected_value="1",
         )
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.polarion("ODS-2555")
     def test_model_metrics_num_total_requests(self, model_car_inference_service, prometheus):
         """Verify number of total model requests in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
@@ -97,7 +97,7 @@ def test_model_metrics_num_total_requests(self, model_car_inference_service, pro
             greater_than=True,
         )
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.polarion("ODS-2555")
     def test_model_metrics_cpu_utilization(self, model_car_inference_service, prometheus):
         """Verify CPU utilization data in OpenShift monitoring system (UserWorkloadMonitoring) metrics"""
diff --git a/tests/model_serving/model_server/kserve/metrics/test_non_admin_users.py b/tests/model_serving/model_server/kserve/metrics/test_non_admin_users.py
@@ -34,7 +34,7 @@
     ],
     indirect=True,
 )
-@pytest.mark.sanity
+@pytest.mark.tier1
 @pytest.mark.rawdeployment
 class TestRawUnprivilegedUserMetrics:
     @pytest.mark.metrics
diff --git a/tests/model_serving/model_server/kserve/model_car/test_oci_image.py b/tests/model_serving/model_server/kserve/model_car/test_oci_image.py
@@ -41,7 +41,7 @@
     indirect=True,
 )
 class TestKserveModelCar:
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.jira("RHOAIENG-13465")
     def test_model_car_no_restarts(self, model_car_inference_service):
         """Verify that model pod doesn't restart"""
@@ -54,7 +54,7 @@ def test_model_car_no_restarts(self, model_car_inference_service):
         ]
         assert not restarted_containers, f"Containers {restarted_containers} restarted"
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.ocp_interop
     @pytest.mark.jira("RHOAIENG-12306")
     def test_model_car_using_rest(self, model_car_inference_service):
@@ -67,7 +67,7 @@ def test_model_car_using_rest(self, model_car_inference_service):
             use_default_query=True,
         )
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     @pytest.mark.ocp_interop
     @pytest.mark.jira("RHOAIENG-38674")
     def test_model_status_loaded(self, model_car_inference_service):
diff --git a/tests/model_serving/model_server/kserve/negative/test_invalid_model_name.py b/tests/model_serving/model_server/kserve/negative/test_invalid_model_name.py
@@ -22,7 +22,7 @@
 VALID_BODY_RAW = json.dumps(VALID_OVMS_INFERENCE_BODY)
 
 
-@pytest.mark.tier1
+@pytest.mark.tier2
 class TestInvalidModelName:
     """Test class for verifying error handling when targeting a non-existent model.
 
diff --git a/tests/model_serving/model_server/kserve/negative/test_malformed_json_payload.py b/tests/model_serving/model_server/kserve/negative/test_malformed_json_payload.py
@@ -25,7 +25,7 @@
 TRAILING_COMMA_BODY = '{"inputs": [{"name": "Input3",}]}'
 
 
-@pytest.mark.tier1
+@pytest.mark.tier2
 @pytest.mark.rawdeployment
 class TestMalformedJsonPayload:
     """Test class for verifying error handling when receiving malformed JSON payloads.
diff --git a/tests/model_serving/model_server/kserve/negative/test_missing_required_fields.py b/tests/model_serving/model_server/kserve/negative/test_missing_required_fields.py
@@ -19,7 +19,7 @@
 pytestmark = pytest.mark.usefixtures("valid_aws_config")
 
 
-@pytest.mark.tier1
+@pytest.mark.tier2
 @pytest.mark.rawdeployment
 class TestMissingRequiredFields:
     """Test class for verifying error handling when required fields are missing.
diff --git a/tests/model_serving/model_server/kserve/negative/test_unsupported_content_type.py b/tests/model_serving/model_server/kserve/negative/test_unsupported_content_type.py
@@ -20,7 +20,7 @@
 pytestmark = pytest.mark.usefixtures("valid_aws_config")
 
 
-@pytest.mark.tier1
+@pytest.mark.tier2
 @pytest.mark.rawdeployment
 class TestUnsupportedContentType:
     """Test class for verifying error handling when using unsupported Content-Type headers.
diff --git a/tests/model_serving/model_server/kserve/negative/test_wrong_input_data_type.py b/tests/model_serving/model_server/kserve/negative/test_wrong_input_data_type.py
@@ -32,7 +32,7 @@ def _make_body_with_input_override(**overrides: Any) -> str:
 INVALID_DATATYPE_BODY = _make_body_with_input_override(datatype="INVALID_TYPE")
 
 
-@pytest.mark.tier1
+@pytest.mark.tier2
 class TestWrongInputDataType:
     """Test class for verifying error handling when input tensor has wrong data type.
 
diff --git a/tests/model_serving/model_server/kserve/raw_deployment/test_kserve_raw_routes_reconciliation.py b/tests/model_serving/model_server/kserve/raw_deployment/test_kserve_raw_routes_reconciliation.py
@@ -23,7 +23,7 @@
 class TestONNXRawRouteReconciliation:
     """Test suite for  Validating reconciliation"""
 
-    @pytest.mark.smoke
+    @pytest.mark.tier1
     def test_raw_onnx_rout_reconciliation(self, ovms_raw_inference_service):
         """
         Verify that the KServe Raw ONNX model can be queried using REST
diff --git a/tests/model_serving/model_server/kserve/stop_resume/test_raw_stop_resume_model.py b/tests/model_serving/model_server/kserve/stop_resume/test_raw_stop_resume_model.py
@@ -15,7 +15,7 @@
 
 
 @pytest.mark.rawdeployment
-@pytest.mark.smoke
+@pytest.mark.tier1
 @pytest.mark.parametrize(
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_raw_inference_service",
     [
@@ -68,7 +68,7 @@ def test_stop_and_update_to_true_delete_pod_rollout(
 
 
 @pytest.mark.rawdeployment
-@pytest.mark.smoke
+@pytest.mark.tier1
 @pytest.mark.parametrize(
     "unprivileged_model_namespace, ovms_kserve_serving_runtime, ovms_raw_inference_service",
     [

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`],`
`19`	`19`	`indirect=True,`
`20`	`20`	`)`
`21`		`-@pytest.mark.sanity`
	`21`	`+@pytest.mark.smoke`
`22`	`22`	`@pytest.mark.rawdeployment`
`23`	`23`	`class TestRawUnprivilegedUser:`
`24`	`24`	`@pytest.mark.polarion("ODS-2611")`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`
`9`	`9`	`@pytest.mark.rawdeployment`
`10`		`-@pytest.mark.sanity`
	`10`	`+@pytest.mark.tier1`
`11`	`11`	`@pytest.mark.parametrize(`
`12`	`12`	`"unprivileged_model_namespace,ovms_kserve_serving_runtime",`
`13`	`13`	`[`
`@@ -56,7 +56,7 @@ def test_private_inference_graph_raw_deployment(self, dog_breed_inference_graph)`
`56`	`56`	`insecure=True,`
`57`	`57`	`)`
`58`	`58`
`59`		`- @pytest.mark.smoke`
	`59`	`+ @pytest.mark.tier1`
`60`	`60`	`@pytest.mark.parametrize(`
`61`	`61`	`"dog_breed_inference_graph",`
`62`	`62`	`[`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`)`
`10`	`10`	`from utilities.constants import KServeDeploymentType, RunTimeConfigs`
`11`	`11`
`12`		`-pytestmark = [pytest.mark.sanity, pytest.mark.usefixtures("valid_aws_config")]`
	`12`	`+pytestmark = [pytest.mark.tier1, pytest.mark.usefixtures("valid_aws_config")]`
`13`	`13`
`14`	`14`
`15`	`15`	`ISVC_ENV_VARS_CONFIG = {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`indirect=True,`
`25`	`25`	`)`
`26`	`26`	`class TestISVCPullSecretUpdate:`
`27`		`- @pytest.mark.smoke`
	`27`	`+ @pytest.mark.tier1`
`28`	`28`	`def test_initial_pull_secret_set(self, model_car_raw_inference_service_with_pull_secret):`
`29`	`29`	`"""Ensure initial pull secret is correctly set in the pod"""`
`30`	`30`	`verify_pull_secret(`