Merge branch 'main' into openai-compatible-tests

Author: jgarciao

tests/model_registry/conftest.py

@@ -167,7 +167,6 @@ def model_registry_instance_rest_endpoint(admin_client: DynamicClient, model_reg
 @pytest.fixture(scope="session")
 def updated_dsc_component_state_scope_session(
     pytestconfig: Config,
-    request: FixtureRequest,
     admin_client: DynamicClient,
 ) -> Generator[DataScienceCluster, Any, Any]:
     dsc_resource = get_data_science_cluster(client=admin_client)

tests/model_registry/rbac/conftest.py

@@ -342,9 +342,9 @@ def model_registry_instance_parametrized(
     """Create Model Registry instance parametrized"""
     with ExitStack() as stack:
         model_registry_instances = []
-        for param in request.param:
+        mr_instances = [stack.enter_context(ModelRegistry(**param)) for param in request.param]
+        for mr_instance in mr_instances:
             # Common parameters for both ModelRegistry classes
-            mr_instance = stack.enter_context(ModelRegistry(**param))  # noqa: FCN001
             mr_instance.wait_for_condition(condition="Available", status="True")
             mr_instance.wait_for_condition(condition="OAuthProxyAvailable", status="True")
             model_registry_instances.append(mr_instance)

tests/model_registry/rbac/multiple_instance_utils.py

@@ -17,7 +17,6 @@
 )
 
 ns_name = py_config["model_registry_namespace"]
-ns_params = {"ns_name": ns_name}
 
 resource_names = [f"{DB_BASE_RESOURCES_NAME}{index}" for index in range(0, NUM_MR_INSTANCES)]
 
@@ -92,7 +91,6 @@
 # Add this complete set of parameters as a pytest.param tuple to the list.
 MR_MULTIPROJECT_TEST_SCENARIO_PARAMS = [
     pytest.param(
-        ns_params,  # updated_dsc_component_state_parametrized (expects dict)
         db_secret_params,
         db_pvc_params,
         db_service_params,

tests/model_registry/rbac/test_mr_rbac.py

@@ -135,7 +135,6 @@ class TestUserMultiProjectPermission:
 
     @pytest.mark.parametrize(
         (
-            "updated_dsc_component_state_scope_session, "
             "db_secret_parametrized, "
             "db_pvc_parametrized, "
             "db_service_parametrized, "

tests/model_registry/rest_api/conftest.py

@@ -257,6 +257,9 @@ def patch_mysql_deployment_with_ssl_ca(
 
     patch = {"spec": {"template": {"spec": {"volumes": volumes, "containers": [my_sql_container]}}}}
     with ResourceEditor(patches={model_registry_db_deployments[0]: patch}):
+        wait_for_pods_running(
+            admin_client=admin_client, namespace_name=model_registry_namespace, number_of_consecutive_checks=3
+        )
         model_registry_db_deployments[0].wait_for_condition(condition="Available", status="True")
         yield model_registry_db_deployments[0]
 
@@ -323,6 +326,12 @@ def mysql_ssl_secrets(
         "server_cert_secret": server_cert_secret,
         "server_key_secret": server_key_secret,
     }
+    if ca_secret.exists:
+        ca_secret.delete(wait=True)
+    if server_cert_secret.exists:
+        server_cert_secret.delete(wait=True)
+    if server_key_secret.exists:
+        server_key_secret.delete(wait=True)
 
 
 @pytest.fixture(scope="function")

tests/model_registry/rest_api/test_model_registry_secure_db.py

@@ -13,7 +13,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.mark.usefixtures("updated_dsc_component_state_scope_session", "model_registry_instance")
 class TestModelRegistryWithSecureDB:
     """
     Test suite for validating Model Registry functionality with a secure MySQL database connection (SSL/TLS).
@@ -42,7 +41,6 @@ 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,
@@ -88,7 +86,10 @@ def test_register_model_with_invalid_ca(
         indirect=True,
     )
     @pytest.mark.usefixtures(
-        "deploy_secure_mysql_and_mr", "ca_configmap_for_test", "patch_mysql_deployment_with_ssl_ca"
+        "model_registry_metadata_db_resources",
+        "deploy_secure_mysql_and_mr",
+        "ca_configmap_for_test",
+        "patch_mysql_deployment_with_ssl_ca",
     )
     @pytest.mark.smoke
     def test_register_model_with_valid_ca(