fix: merge changes from remote

Author: fege

tests/conftest.py

@@ -947,62 +947,3 @@ def oci_registry_route(admin_client: DynamicClient, oci_registry_service: Servic
 def oci_registry_host(oci_registry_route: Route) -> str:
     """Get the OCI registry host from the route"""
     return oci_registry_route.host
-
-
-def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None:
-    """
-    Enforce test tier hierarchy by excluding tests with explicit higher-tier markers.
-
-    Test tier hierarchy (from lowest to highest):
-        smoke < sanity < tier1 < tier2
-
-    When running tests with a specific tier marker (e.g., -m smoke), this hook
-    automatically excludes tests that have explicit markers for higher tiers,
-    preventing marker inheritance issues from class-level parametrization.
-
-    Example:
-        - Running 'pytest -m smoke' excludes tests marked @pytest.mark.sanity/tier1/tier2
-        - Running 'pytest -m sanity' excludes tests marked @pytest.mark.tier1/tier2
-        - Running 'pytest -m tier1' excludes tests marked @pytest.mark.tier2
-    """
-    # Define tier hierarchy (order matters: lower tiers first)
-    tier_hierarchy = ["smoke", "sanity", "tier1", "tier2"]
-
-    # Get the marker expression from command line
-    markexpr = config.getoption("-m", "")  # noqa: FCN001
-    if not markexpr:
-        return
-
-    # Find which tier is being requested
-    requested_tier = None
-    for tier in tier_hierarchy:
-        if tier in markexpr:
-            requested_tier = tier
-            break
-
-    if not requested_tier:
-        return
-
-    # Get index of requested tier
-    requested_tier_idx = tier_hierarchy.index(requested_tier)
-
-    # Get all higher tiers that should be excluded
-    excluded_tiers = set(tier_hierarchy[requested_tier_idx + 1 :])  # noqa: E203
-
-    if not excluded_tiers:
-        return  # No higher tiers to exclude
-
-    # Skip tests that have explicit markers for higher tiers
-    skip_marker = pytest.mark.skip(
-        reason=f"Has explicit {'/'.join(excluded_tiers)} marker, excluded from {requested_tier}"
-    )
-
-    skipped_count = 0
-    for item in items:
-        marker_names = {mark.name for mark in item.iter_markers()}
-        if marker_names & excluded_tiers:  # If any excluded tier marker is present
-            item.add_marker(skip_marker)  # noqa: FCN001
-            skipped_count += 1
-
-    if skipped_count > 0:
-        print(f"\n[Tier Filter] Excluded {skipped_count} tests with {excluded_tiers} markers from {requested_tier} run")

tests/model_registry/model_catalog/conftest.py

@@ -38,99 +38,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.fixture(scope="session")
-def catalog_pod_model_counts(
-    admin_client: DynamicClient,
-    recreated_model_catalog_configmap: ConfigMap,
-) -> dict[str, int]:
-    """
-    Session-scoped fixture that extracts model counts from catalog pod logs.
-
-    Scrapes logs for earliest occurrences of:
-    - "redhat_ai_validated_models: loaded x models"
-    - "redhat_ai_models: loaded y models"
-
-    Returns:
-        Dictionary with keys "redhat_ai_validated_models" and "redhat_ai_models"
-        containing the extracted model counts
-    """
-    # Get the model catalog pod
-    namespace_name = py_config["model_registry_namespace"]
-    catalog_pods = get_model_catalog_pod(client=admin_client, model_registry_namespace=namespace_name)
-    assert len(catalog_pods) > 0, f"No model catalog pods found in namespace {namespace_name}"
-
-    catalog_pod = catalog_pods[0]  # Use the first pod if multiple exist
-
-    # Get pod logs
-    logs = catalog_pod.log(container="catalog")
-
-    # Define regex patterns for extraction
-    patterns = {
-        "redhat_ai_validated_models": r"redhat_ai_validated_models: loaded (\d+) models",
-        "redhat_ai_models": r"redhat_ai_models: loaded (\d+) models",
-    }
-
-    # Extract counts
-    model_counts = {}
-    for key, pattern in patterns.items():
-        match = re.search(pattern, logs)
-        if match:
-            model_counts[key] = int(match.group(1))
-        else:
-            LOGGER.warning(f"Pattern '{pattern}' not found in catalog pod logs")
-            model_counts[key] = 0  # Default to 0 if not found
-
-    LOGGER.info(f"Extracted model counts from catalog pod logs: {model_counts}")
-    return model_counts
-
-
-@pytest.fixture(scope="session")
-def recreated_model_catalog_configmap(
-    admin_client: DynamicClient,
-) -> ConfigMap:
-    """
-    Session-scoped fixture that deletes the DEFAULT_CUSTOM_MODEL_CATALOG ConfigMap
-    and waits for it to be automatically recreated, and cleans up catalog pod, to start with a fresh log
-
-    Returns:
-        ConfigMap: The recreated ConfigMap instance
-    """
-    namespace_name = py_config["model_registry_namespace"]
-    # TODO: RHOAIENG-46741 would require changing this to look for configmaps based on label
-    # Get the existing ConfigMap
-    configmap = ConfigMap(
-        name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=namespace_name, ensure_exists=True
-    )
-
-    LOGGER.info(f"Deleting ConfigMap {DEFAULT_CUSTOM_MODEL_CATALOG} to test recreation")
-
-    # Delete the ConfigMap
-    configmap.delete()
-
-    LOGGER.info(f"ConfigMap {DEFAULT_CUSTOM_MODEL_CATALOG} deleted, waiting for recreation")
-
-    # Wait for it to be recreated using TimeoutSampler
-    recreated_configmap = ConfigMap(
-        name=DEFAULT_CUSTOM_MODEL_CATALOG,
-        client=admin_client,
-        namespace=namespace_name,
-    )
-
-    # Use TimeoutSampler to wait for recreation (2 minutes timeout)
-    for sample in TimeoutSampler(
-        wait_timeout=120,  # 2 minutes
-        sleep=5,
-        func=lambda: recreated_configmap.exists,
-        exceptions_dict={NotFoundError: []},
-    ):
-        if sample:  # ConfigMap exists
-            break
-
-    LOGGER.info(f"ConfigMap {DEFAULT_CUSTOM_MODEL_CATALOG} recreated successfully")
-    wait_for_model_catalog_pod_ready_after_deletion(client=admin_client, model_registry_namespace=namespace_name)
-    return recreated_configmap
-
-
 @pytest.fixture()
 def sparse_override_catalog_source(
     request: pytest.FixtureRequest,