Merge branch 'main' into merge_sources

Author: dbasunag

OWNERS

@@ -1,4 +1,8 @@
 approvers:
-  - <>
+  - dbasunag
+  - jgarciao
+  - lugi0
 reviewers:
-  - <>
+  - dbasunag
+  - jgarciao
+  - lugi0

tests/model_registry/model_catalog/catalog_config/test_default_model_catalog.py

@@ -15,7 +15,7 @@
 from ocp_resources.route import Route
 from ocp_resources.service import Service
 
-from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM
+from tests.model_registry.constants import DEFAULT_MODEL_CATALOG_CM, DEFAULT_CUSTOM_MODEL_CATALOG
 from tests.model_registry.model_catalog.constants import REDHAT_AI_CATALOG_ID, CATALOG_CONTAINER, DEFAULT_CATALOGS
 from tests.model_registry.model_catalog.catalog_config.utils import (
     validate_model_catalog_enabled,
@@ -35,7 +35,6 @@
         "model_registry_namespace",
         "original_user",
         "test_idp_user",
-        "enabled_model_catalog_config_map",
     )
 ]
 
@@ -47,7 +46,7 @@ class TestModelCatalogGeneral:
         [
             pytest.param(
                 {"configmap_name": DEFAULT_CUSTOM_MODEL_CATALOG},
-                2,
+                0,
                 False,
                 id="test_model_catalog_sources_configmap_install",
                 marks=pytest.mark.install,
@@ -168,7 +167,6 @@ class TestModelCatalogDefault:
     def test_model_catalog_default_catalog_sources(
         self,
         pytestconfig: pytest.Config,
-        enabled_model_catalog_config_map: ConfigMap,
         test_idp_user: UserTestSession,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
@@ -204,7 +202,6 @@ def test_model_catalog_default_catalog_sources(
 
     def test_model_default_catalog_get_models_by_source(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
     ):
@@ -217,7 +214,6 @@ def test_model_default_catalog_get_models_by_source(
 
     def test_model_default_catalog_get_model_by_name(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -235,7 +231,6 @@ def test_model_default_catalog_get_model_by_name(
 
     def test_model_default_catalog_get_model_artifact(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -261,7 +256,6 @@ class TestModelCatalogDefaultData:
 
     def test_model_default_catalog_number_of_models(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         default_catalog_api_response: dict[Any, Any],
         default_model_catalog_yaml_content: dict[Any, Any],
     ):
@@ -278,7 +272,6 @@ def test_model_default_catalog_number_of_models(
 
     def test_model_default_catalog_correspondence_of_model_name(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         default_catalog_api_response: dict[Any, Any],
         default_model_catalog_yaml_content: dict[Any, Any],
         catalog_openapi_schema: dict[Any, Any],
@@ -343,7 +336,6 @@ def test_model_default_catalog_correspondence_of_model_name(
 
     def test_model_default_catalog_random_artifact(
         self: Self,
-        enabled_model_catalog_config_map: ConfigMap,
         default_model_catalog_yaml_content: dict[Any, Any],
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],

tests/model_registry/model_catalog/conftest.py

@@ -18,10 +18,9 @@
     REDHAT_AI_CATALOG_ID,
     DEFAULT_CATALOGS,
 )
-from tests.model_registry.model_catalog.utils import get_models_from_catalog_api, get_catalog_url_and_headers
+from tests.model_registry.model_catalog.utils import get_models_from_catalog_api
 from tests.model_registry.constants import (
     CUSTOM_CATALOG_ID1,
-    DEFAULT_MODEL_CATALOG_CM,
     DEFAULT_CUSTOM_MODEL_CATALOG,
 )
 from tests.model_registry.utils import (
@@ -39,57 +38,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.fixture(scope="session")
-def enabled_model_catalog_config_map(
-    admin_client: DynamicClient,
-    model_registry_namespace: str,
-    current_client_token: str,
-) -> Generator[ConfigMap, None, None]:
-    """
-    Enable all catalogs in the default model catalog configmap
-    """
-    # Get operator-managed default sources ConfigMap
-    default_sources_cm = ConfigMap(
-        name=DEFAULT_MODEL_CATALOG_CM, client=admin_client, namespace=model_registry_namespace, ensure_exists=True
-    )
-
-    # Get the sources.yaml content from default sources
-    default_sources_yaml = default_sources_cm.instance.data.get("sources.yaml", "")
-
-    # Parse the YAML and extract only catalogs, enabling each one
-    parsed_yaml = yaml.safe_load(default_sources_yaml)
-    if not parsed_yaml or "catalogs" not in parsed_yaml:
-        raise RuntimeError("No catalogs found in default sources ConfigMap")
-
-    for catalog in parsed_yaml["catalogs"]:
-        catalog["enabled"] = True
-    enabled_yaml_dict = {"catalogs": parsed_yaml["catalogs"]}
-    enabled_sources_yaml = yaml.dump(enabled_yaml_dict, default_flow_style=False, sort_keys=False)
-
-    LOGGER.info("Adding enabled catalogs to model-catalog-sources ConfigMap")
-
-    # Get user-managed sources ConfigMap
-    user_sources_cm = ConfigMap(
-        name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=model_registry_namespace, ensure_exists=True
-    )
-
-    patches = {"data": {"sources.yaml": enabled_sources_yaml}}
-
-    with ResourceEditor(patches={user_sources_cm: patches}):
-        # Wait for the model catalog pod to be ready
-        is_model_catalog_ready(client=admin_client, model_registry_namespace=model_registry_namespace)
-
-        # Get the model catalog URL and headers and wait for the API to be fully ready
-        catalog_url, headers = get_catalog_url_and_headers(
-            admin_client=admin_client,
-            model_registry_namespace=model_registry_namespace,
-            token=current_client_token,
-        )
-        wait_for_model_catalog_api(url=catalog_url, headers=headers)
-
-        yield user_sources_cm
-
-
 @pytest.fixture(scope="class")
 def model_catalog_config_map(
     request: pytest.FixtureRequest, admin_client: DynamicClient, model_registry_namespace: str

tests/model_registry/model_catalog/constants.py

@@ -25,12 +25,14 @@
         "type": "yaml",
         "properties": {"yamlCatalogPath": "/shared-data/models-catalog.yaml"},
         "labels": [REDHAT_AI_CATALOG_NAME],
+        "enabled": True,
     },
     "redhat_ai_validated_models": {
         "name": REDHAT_AI_VALIDATED_CATALOG_NAME,
         "type": "yaml",
         "properties": {"yamlCatalogPath": "/shared-data/validated-models-catalog.yaml"},
         "labels": [REDHAT_AI_VALIDATED_CATALOG_NAME],
+        "enabled": True,
     },
 }
 REDHAT_AI_CATALOG_ID: str = "redhat_ai_models"

tests/model_registry/model_catalog/huggingface/test_huggingface_exclude_models.py

@@ -7,7 +7,10 @@
 
 LOGGER = get_logger(name=__name__)
 
-pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]
+pytestmark = [
+    pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace"),
+    pytest.mark.skip,
+]
 
 
 @pytest.mark.parametrize(

tests/model_registry/model_catalog/huggingface/test_huggingface_model_search.py

@@ -8,6 +8,8 @@
 
 LOGGER = get_logger(name=__name__)
 
+pytestmark = [pytest.mark.skip]
+
 
 @pytest.mark.parametrize(
     "updated_catalog_config_map, hf_model_name, source_filter",

tests/model_registry/model_catalog/huggingface/test_huggingface_model_sorting.py

@@ -5,6 +5,8 @@
 from tests.model_registry.model_catalog.sorting.utils import assert_model_sorting
 from tests.model_registry.model_catalog.utils import get_hf_catalog_str
 
+pytestmark = [pytest.mark.skip]
+
 
 @pytest.mark.parametrize(
     "updated_catalog_config_map",

tests/model_registry/model_catalog/huggingface/test_huggingface_model_validation.py

@@ -13,7 +13,10 @@
 
 LOGGER = get_logger(name=__name__)
 
-pytestmark = [pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace")]
+pytestmark = [
+    pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_namespace"),
+    pytest.mark.skip,
+]
 
 
 @pytest.mark.parametrize(

tests/model_registry/model_catalog/metadata/test_catalog_preview.py

@@ -22,7 +22,6 @@ class TestCatalogPreviewExistingSource:
 
     @pytest.mark.parametrize("default_model_catalog_yaml_content", [VALIDATED_CATALOG_ID], indirect=True)
     @pytest.mark.usefixtures(
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
     def test_catalog_preview_included_and_excluded_models_filters(
@@ -82,7 +81,6 @@ def test_catalog_preview_included_and_excluded_models_filters(
 
     @pytest.mark.parametrize("default_model_catalog_yaml_content", [VALIDATED_CATALOG_ID], indirect=True)
     @pytest.mark.usefixtures(
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
     def test_catalog_preview_no_filters(
@@ -130,7 +128,6 @@ def test_catalog_preview_no_filters(
 
     @pytest.mark.parametrize("default_model_catalog_yaml_content", [VALIDATED_CATALOG_ID], indirect=True)
     @pytest.mark.usefixtures(
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
     @pytest.mark.parametrize(
@@ -241,7 +238,6 @@ class TestCatalogPreviewErrorHandling:
         ],
     )
     @pytest.mark.usefixtures(
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
     def test_catalog_preview_invalid_config(
@@ -295,7 +291,6 @@ class TestCatalogPreviewUserProvidedData:
     """
 
     @pytest.mark.usefixtures(
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
     def test_catalog_preview_with_custom_catalog_data(

tests/model_registry/model_catalog/metadata/test_custom_properties.py

@@ -18,7 +18,6 @@
 pytestmark = [
     pytest.mark.usefixtures(
         "updated_dsc_component_state_scope_session",
-        "enabled_model_catalog_config_map",
         "model_registry_namespace",
     )
 ]