Add default MC validation tests to upgrade

Author: dbasunag

tests/model_registry/conftest.py

@@ -32,7 +32,6 @@
 from tests.model_registry.utils import generate_namespace_name
 from utilities.general import generate_random_name
 
-from tests.model_registry.utils import delete_model_catalog_configmap
 
 from tests.model_registry.constants import (
     MR_OPERATOR_NAME,
@@ -79,7 +78,6 @@ def model_registry_instance(
         mr_instance = ModelRegistry(name=MR_INSTANCE_NAME, namespace=model_registry_namespace, ensure_exists=True)
         yield [mr_instance]
         mr_instance.delete(wait=True)
-        delete_model_catalog_configmap(admin_client=admin_client, namespace=model_registry_namespace)
     else:
         LOGGER.warning("Requested Oauth Proxy configuration:")
         mr_objects = get_model_registry_objects(
@@ -101,9 +99,6 @@ def model_registry_instance(
                 )
             yield mr_instances
 
-        # since model catalog is associated with model registry instances, we need to clean up the config map manually
-        delete_model_catalog_configmap(admin_client=admin_client, namespace=model_registry_namespace)
-
 
 @pytest.fixture(scope="class")
 def model_registry_metadata_db_resources(

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -10,6 +10,7 @@
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.route import Route
 from ocp_resources.service import Service
+from tests.model_registry.model_catalog.constants import DEFAULT_CATALOG_ID, DEFAULT_CATALOG_NAME
 from tests.model_registry.model_catalog.utils import (
     validate_model_catalog_enabled,
     execute_get_command,
@@ -25,6 +26,7 @@
     "model_registry_namespace",
 )
 class TestModelCatalog:
+    @pytest.mark.post_upgrade
     def test_config_map_exists(self: Self, catalog_config_map: ConfigMap):
         # Check that the default configmaps is created when model registry is
         # enabled on data science cluster.
@@ -55,6 +57,7 @@ def test_config_map_exists(self: Self, catalog_config_map: ConfigMap):
             ),
         ],
     )
+    @pytest.mark.post_upgrade
     def test_model_catalog_resources_exists(
         self: Self, admin_client: DynamicClient, model_registry_namespace: str, resource_name: Any
     ):
@@ -79,6 +82,8 @@ def test_model_catalog_no_custom_catalog(
         )["items"]
         assert result
         assert len(result) == 1, f"Expected no custom models to be present. Actual: {result}"
+        assert result[0]["id"] == DEFAULT_CATALOG_ID
+        assert result[0]["name"] == DEFAULT_CATALOG_NAME
 
     def test_default_config_map_not_present(self: Self, model_registry_namespace: str):
         # RHOAIENG-33246: Introduced a new configmap. It should be removed before 2.25 release

tests/model_registry/rbac/conftest.py

@@ -22,15 +22,13 @@
 from pyhelper_utils.shell import run_command
 
 from tests.model_registry.rbac.utils import wait_for_oauth_openshift_deployment, create_role_binding
-from tests.model_registry.utils import delete_model_catalog_configmap
 from utilities.general import generate_random_name
 from utilities.infra import login_with_user_password
 from utilities.user_utils import UserTestSession, create_htpasswd_file, wait_for_user_creation
 from tests.model_registry.rbac.group_utils import create_group
 from tests.model_registry.constants import (
     MR_INSTANCE_NAME,
 )
-from pytest_testconfig import config as py_config
 
 LOGGER = get_logger(name=__name__)
 
@@ -355,8 +353,6 @@ def model_registry_instance_parametrized(
             f"Created {len(model_registry_instances)} MR instances: {[mr.name for mr in model_registry_instances]}"
         )
         yield model_registry_instances
-    # delete the model catalog configmap manually:
-    delete_model_catalog_configmap(admin_client=admin_client, namespace=py_config["model_registry_namespace"])
 
 
 @pytest.fixture(scope="session")

tests/model_registry/utils.py

@@ -24,7 +24,6 @@
     MARIADB_MY_CNF,
     PORT_MAP,
     MODEL_REGISTRY_POD_FILTER,
-    DEFAULT_MODEL_CATALOG,
 )
 from tests.model_registry.exceptions import ModelRegistryResourceNotFoundError
 from utilities.exceptions import ProtocolNotSupportedError, TooManyServicesError
@@ -719,12 +718,6 @@ def validate_mlmd_removal_in_model_registry_pod_log(
     assert not errors, f"Log validation failed with error(s): {errors}"
 
 
-def delete_model_catalog_configmap(admin_client: DynamicClient, namespace: str) -> None:
-    cfg = ConfigMap(name=DEFAULT_MODEL_CATALOG, client=admin_client, namespace=namespace)
-    if cfg.exists:
-        cfg.delete(wait=True)
-
-
 def get_model_catalog_pod(client: DynamicClient, model_registry_namespace: str) -> list[Pod]:
     return list(
         Pod.get(namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=client)