change: add sanity to tests that are not failing or already marked

Author: fege

tests/model_registry/async_job/test_async_upload_e2e.py

@@ -61,7 +61,7 @@
 class TestAsyncUploadE2E:
     """RHOAIENG-32501: Test for async upload job with real MinIO, OCI registry, Connection Secrets and Model Registry"""
 
-    # FAILS until https://github.com/kubeflow/model-registry/pull/1499 is merged
+    # FAILS until https://github.com/kubeflow/model-registry/pull/1499 is merged downstream
     @pytest.mark.dependency(name="job_creation_and_pod_spawning")
     def test_job_creation_and_pod_spawning(
         self: Self,

tests/model_registry/model_catalog/test_custom_model_catalog.py

@@ -35,6 +35,7 @@
     "updated_catalog_config_map",
 )
 class TestModelCatalogRhec:
+    @pytest.mark.sanity
     def test_model_custom_catalog_sources(
         self: Self,
         updated_catalog_config_map: tuple[ConfigMap, str, str],
@@ -52,6 +53,7 @@ def test_model_custom_catalog_sources(
         assert len(result) == 1
         assert result[0]["id"] == expected_catalog_values["id"]
 
+    @pytest.mark.sanity
     def test_model_custom_catalog_models(
         self: Self,
         updated_catalog_config_map: tuple[ConfigMap, str, str],
@@ -68,6 +70,7 @@ def test_model_custom_catalog_models(
         )["items"]
         assert result, f"Expected custom models to be present. Actual: {result}"
 
+    @pytest.mark.sanity
     def test_model_custom_catalog_get_model_by_name(
         self: Self,
         updated_catalog_config_map: tuple[ConfigMap, str, str],
@@ -85,6 +88,7 @@ def test_model_custom_catalog_get_model_by_name(
         )
         assert result["name"] == model_name
 
+    @pytest.mark.sanity
     def test_model_custom_catalog_get_artifact(
         self: Self,
         updated_catalog_config_map: tuple[ConfigMap, str, str],

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -18,6 +18,7 @@
     "model_registry_metadata_db_resources",
 )
 class TestModelCatalog:
+    @pytest.mark.sanity
     def test_config_map_not_created(self: Self, catalog_config_map: ConfigMap):
         # Check that the default configmaps does not exist, when model registry is not created
         assert not catalog_config_map.exists
@@ -29,11 +30,13 @@ def test_config_map_exists(self: Self, model_registry_instance: ModelRegistry, c
         models = yaml.safe_load(catalog_config_map.instance.data["sources.yaml"])["catalogs"]
         assert not models, f"Expected no default models to be present. Actual: {models}"
 
+    @pytest.mark.sanity
     def test_operator_pod_enabled_model_catalog(
         self: Self, model_registry_instance: ModelRegistry, model_registry_operator_pod: Pod
     ):
         assert validate_model_catalog_enabled(pod=model_registry_operator_pod)
 
+    @pytest.mark.sanity
     def test_model_catalog_no_custom_catalog(
         self,
         model_registry_instance: ModelRegistry,

tests/model_registry/negative_tests/test_db_migration.py

@@ -16,6 +16,7 @@
     "updated_dsc_component_state_scope_session", "model_registry_metadata_db_resources", "model_registry_instance"
 )
 class TestDBMigration:
+    @pytest.mark.sanity
     def test_db_migration_negative(
         self: Self,
         admin_client: DynamicClient,

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -28,6 +28,7 @@
 )
 @pytest.mark.custom_namespace
 class TestModelRegistryCreationNegative:
+    @pytest.mark.sanity
     def test_registering_model_negative(
         self: Self,
         current_client_token: str,

tests/model_registry/python_client/test_model_registry_creation.py

@@ -65,6 +65,7 @@ def test_registering_model(
         if errors:
             pytest.fail("errors found in model registry response validation:\n{}".format("\n".join(errors)))
 
+    @pytest.mark.sanity
     def test_model_registry_operator_env(
         self,
         model_registry_namespace: str,
@@ -78,6 +79,7 @@ def test_model_registry_operator_env(
         if not namespace_env:
             pytest.fail("Missing environment variable REGISTRIES_NAMESPACE")
 
+    @pytest.mark.sanity
     def test_model_registry_grpc_container_removal(self, model_registry_deployment_containers: list[dict[str, Any]]):
         """
         RHOAIENG-26239: Test to ensure removal of grpc container from model registry deployment
@@ -88,6 +90,7 @@ def test_model_registry_grpc_container_removal(self, model_registry_deployment_c
         """
         validate_no_grpc_container(deployment_containers=model_registry_deployment_containers)
 
+    @pytest.mark.sanity
     def test_model_registry_pod_log_mlmd_removal(
         self, model_registry_deployment_containers: list[dict[str, Any]], model_registry_pod: Pod
     ):
@@ -116,6 +119,7 @@ def test_model_registry_pod_log_mlmd_removal(
             ),
         ],
     )
+    @pytest.mark.sanity
     def test_model_registry_endpoint_response(
         self, model_registry_rest_url: list[str], model_registry_rest_headers: dict[str, str], endpoint: str
     ):

tests/model_registry/rbac/test_mr_rbac.py

@@ -145,6 +145,7 @@ class TestUserMultiProjectPermission:
         MR_MULTIPROJECT_TEST_SCENARIO_PARAMS,
         indirect=True,
     )
+    @pytest.mark.sanity
     def test_user_permission_multi_project_parametrized(
         self: Self,
         test_idp_user: UserTestSession,

tests/model_registry/rest_api/test_model_registry_rest_api.py

@@ -86,6 +86,7 @@ def test_validate_model_registry_resource(
             resource_name=data_key,
         )
 
+    @pytest.mark.sanity
     def test_model_registry_validate_api_version(
         self: Self,
         model_registry_instance,
@@ -99,6 +100,7 @@ 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.sanity
     def test_model_registry_validate_oauthproxy_enabled(
         self: Self,
         model_registry_instance,
@@ -187,6 +189,7 @@ def test_create_update_model_artifact(
         ],
         indirect=["updated_model_registry_resource"],
     )
+    @pytest.mark.sanity
     def test_updated_model_version(
         self,
         updated_model_registry_resource: dict[str, Any],
@@ -232,6 +235,7 @@ def test_updated_model_version(
         ],
         indirect=["updated_model_registry_resource"],
     )
+    @pytest.mark.sanity
     def test_updated_registered_model(
         self,
         updated_model_registry_resource: dict[str, Any],

tests/model_registry/rest_api/test_model_registry_secure_db.py

@@ -42,6 +42,7 @@ class TestModelRegistryWithSecureDB:
         "patch_mysql_deployment_with_ssl_ca",
         "patch_invalid_ca",
     )
+    @pytest.mark.sanity
     def test_register_model_with_invalid_ca(
         self: Self,
         admin_client: DynamicClient,

tests/model_registry/rest_api/test_multiple_mr.py

@@ -45,6 +45,7 @@ def test_validate_multiple_model_registry(
             )
             LOGGER.info(f"{mr.name} found")
 
+    @pytest.mark.sanity
     def test_validate_one_model_catalog_configmap(
         self: Self, admin_client: DynamicClient, model_registry_namespace: str
     ):
@@ -60,6 +61,7 @@ def test_validate_one_model_catalog_configmap(
             f"Expected {expected_number_config_maps} modelcatalog sources, found: {config_map_names}"
         )
 
+    # FAILS until https://github.com/opendatahub-io/model-registry-operator/pull/298/ is merged downstream
     def test_validate_one_model_catalog_pod(self: Self, admin_client: DynamicClient, model_registry_namespace: str):
         """
         Validate that even when multiple MR exists on a cluster, only one model catalog pod is created
@@ -73,6 +75,7 @@ def test_validate_one_model_catalog_pod(self: Self, admin_client: DynamicClient,
             f"Expected {expected_number_pods} model catalog pods, found: {[pod.name for pod in catalog_pods]}"
         )
 
+    @pytest.mark.sanity
     def test_validate_register_models_multiple_registries(
         self: Self, model_registry_rest_url: list[str], model_registry_rest_headers: dict[str, str]
     ):