Merge branch 'main' into operator_fix

Author: dbasunag

conftest.py

@@ -42,6 +42,15 @@
 LOGGER = logging.getLogger(name=__name__)
 BASIC_LOGGER = logging.getLogger(name="basic")
 
+# Add support to mark tests that does not have specific marking already, with tier2 marker
+EXCLUDE_MARKERS_FROM_DEFAULT_TIER2: set[str] = {"smoke", "tier1", "tier2", "tier3", "pre_upgrade", "post_upgrade"}
+# To include a component for default marking please add the component path to this list
+DEFAULT_TIER2_MARKER_TEST_PATHS: tuple[str, ...] = (
+    "tests/model_registry",
+    "tests/model_explainability",
+    "tests/model_serving/maas_billing",
+)
+
 
 def pytest_addoption(parser: Parser) -> None:
     aws_group = parser.getgroup(name="AWS")
@@ -286,6 +295,19 @@ def _add_upgrade_test(_item: Item, _upgrade_deployment_modes: list[str]) -> bool
         items[:] = non_upgrade_tests
         config.hook.pytest_deselected(items=upgrade_tests)
 
+    _add_default_tier2_marker(items=items)
+
+
+def _add_default_tier2_marker(items: list[Item]) -> None:
+    """Add tier2 marker to tests that lack any tier/smoke/upgrade marker, for specific components."""
+    for item in items:
+        if not any(item.nodeid.startswith(path) for path in DEFAULT_TIER2_MARKER_TEST_PATHS):
+            continue
+
+        item_markers = {mark.name for mark in item.iter_markers()}
+        if not item_markers & EXCLUDE_MARKERS_FROM_DEFAULT_TIER2:
+            item.add_marker(marker=pytest.mark.tier2)
+
 
 def pytest_sessionstart(session: Session) -> None:
     log_file = session.config.getoption(name="log_file") or "pytest-tests.log"

tests/model_registry/model_registry/rest_api/test_model_registry_rest_api.py

@@ -42,19 +42,18 @@
             {},
             {},
             MODEL_REGISTER_DATA,
-            marks=(pytest.mark.tier1),
+            marks=pytest.mark.tier1,
         ),
         pytest.param(
             {"db_name": "postgres"},
             {"db_name": "postgres"},
             MODEL_REGISTER_DATA,
-            marks=(pytest.mark.tier2),
+            marks=pytest.mark.smoke,
         ),
         pytest.param(
             {"db_name": "default"},
             {"db_name": "default"},
             MODEL_REGISTER_DATA,
-            marks=(pytest.mark.tier2),
         ),
         pytest.param(
             {"db_name": "mariadb"},
@@ -84,7 +83,6 @@ class TestModelRegistryCreationRest:
             pytest.param(
                 MODEL_REGISTER,
                 "register_model",
-                marks=pytest.mark.smoke,
                 id="test_validate_registered_model",
             ),
             pytest.param(
@@ -111,7 +109,6 @@ def test_validate_model_registry_resource(
             resource_name=data_key,
         )
 
-    @pytest.mark.tier2
     @pytest.mark.parametrize(
         "kind, resource_name",
         [
@@ -160,7 +157,6 @@ def test_default_postgres_db_resource_exists(
         for field in ["controller", "blockOwnerDeletion"]:
             assert owner_reference[0][field] is True
 
-    @pytest.mark.tier2
     def test_default_postgres_db_pod_log(
         self: Self,
         skip_if_not_default_db: None,
@@ -180,7 +176,6 @@ def test_default_postgres_db_pod_log(
         postgres_pod_log = pods[0].log(container="postgres")
         assert CONNECTION_STRING in postgres_pod_log
 
-    @pytest.mark.tier2
     def test_model_registry_validate_api_version(
         self: Self,
         admin_client: DynamicClient,
@@ -196,7 +191,6 @@ def test_model_registry_validate_api_version(
         expected_version = f"{ModelRegistry.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO}/{ModelRegistry.ApiVersion.V1BETA1}"
         assert api_version == expected_version
 
-    @pytest.mark.tier2
     def test_model_registry_validate_kuberbacproxy_enabled(
         self: Self,
         model_registry_instance: list[ModelRegistry],
@@ -239,7 +233,6 @@ def test_model_registry_validate_kuberbacproxy_enabled(
         ],
         indirect=["updated_model_registry_resource"],
     )
-    @pytest.mark.tier2
     def test_create_update_model_artifact(
         self,
         updated_model_registry_resource: dict[str, Any],
@@ -284,7 +277,6 @@ def test_create_update_model_artifact(
         ],
         indirect=["updated_model_registry_resource"],
     )
-    @pytest.mark.tier2
     def test_updated_model_version(
         self,
         updated_model_registry_resource: dict[str, Any],
@@ -330,7 +322,6 @@ def test_updated_model_version(
         ],
         indirect=["updated_model_registry_resource"],
     )
-    @pytest.mark.tier2
     def test_updated_registered_model(
         self,
         updated_model_registry_resource: dict[str, Any],
@@ -375,7 +366,6 @@ class TestModelRegistryDeployment:
     Tests the complete deployment workflow from registered model to InferenceService.
     """
 
-    @pytest.mark.tier2
     def test_registered_model_deployment(
         self,
         admin_client: DynamicClient,