fix: update tests

Author: rnetser

conftest.py

@@ -223,8 +223,8 @@ def pytest_runtest_setup(item: Item) -> None:
     """
     Performs the following actions:
     1. Updates global config (`updated_global_config`)
-    2. Adds skip fixture for kserve if serverless or authorino operators are not installed.
-    3. Adds skip fixture for serverless if authorino/serverless/service mesh are not deployed.
+    2. Adds `fail_if_missing_dependant_operators` fixture for Serverless and model registry tests.
+    3. Adds fixtures to enable KServe/model mesh in DSC for model server tests.
     """
 
     BASIC_LOGGER.info(f"\n{separator(symbol_='-', val=item.name)}")

docs/GETTING_STARTED.md

@@ -67,6 +67,13 @@ By default, cluster sanity checks are run to make cluster ready for tests.
 To skip cluster sanity checks, pass `--cluster-sanity-skip-check` to skip all tests.
 To skip RHOAI/ODH-related tests (for example when running in upstream), pass `--cluster-sanity-skip-rhoai-check`.
 
+### Check dependent operators
+By default, `Serveless` (serverless-operator), `Authorino` (authorino-operator) and `Service Mesh` (servicemeshoperator) operators are checked to be installed when  
+running model registry or model server Serverless tests.
+To check only specific operator, pass `--tc=dependent_operators:<operator_name>` to pytest.
+For example, to check only `Serveless` and `Service Mesh` operators, pass `--tc=dependent_operators:serverless-operator,servicemeshoperator`.
+
+
 ### jira integration
 To skip running tests which have open bugs, [pytest_jira](https://github.com/rhevm-qe-automation/pytest_jira) plugin is used.
 To run tests with jira integration, you need to set `PYTEST_JIRA_URL` and `PYTEST_JIRA_TOKEN` environment variables.

tests/conftest.py

@@ -485,7 +485,7 @@ def cluster_sanity_scope_session(
 def fail_if_missing_dependant_operators(admin_client: DynamicClient) -> None:
     missing_operators: list[str] = []
 
-    for operator_name in py_config["dependent_operators"]:
+    for operator_name in py_config.get("dependent_operators", []).split(","):
         LOGGER.info(f"Verifying if {operator_name} is installed")
         for csv in ClusterServiceVersion.get(
             dyn_client=admin_client,

tests/global_config.py

@@ -4,7 +4,7 @@
 applications_namespace: str = "redhat-ods-applications"  # overwritten in conftest.py if distribution is upstream
 dsc_name: str = "default-dsc"
 dsci_name: str = "default-dsci"
-dependent_operators: list[str] = ["servicemeshoperator", "authorino-operator", "serverless-operator"]
+dependent_operators: str = "servicemeshoperator,authorino-operator,serverless-operator"
 
 for _dir in dir():
     val = locals()[_dir]

tests/model_serving/model_server/upgrade/conftest.py

@@ -290,7 +290,7 @@ def caikit_raw_inference_service_scope_session(
             deployment_mode=KServeDeploymentType.RAW_DEPLOYMENT,
             storage_key=models_endpoint_s3_secret_scope_session.name,
             storage_path=ModelStoragePath.EMBEDDING_MODEL,
-            external_route=True,
+            external_route=False,
             teardown=teardown_resources,
             **isvc_kwargs,
         ) as isvc:

tests/model_serving/model_server/upgrade/test_upgrade.py

@@ -33,7 +33,7 @@ def test_raw_caikit_bge_pre_upgrade_inference(self, caikit_raw_inference_service
             inference_service=caikit_raw_inference_service_scope_session,
             inference_config=CAIKIT_STANDALONE_INFERENCE_CONFIG,
             inference_type="embedding",
-            protocol=Protocols.HTTPS,
+            protocol=Protocols.HTTP,
             model_name=ModelName.CAIKIT_BGE_LARGE_EN,
             use_default_query=True,
         )
@@ -105,7 +105,7 @@ def test_raw_caikit_bge_post_upgrade_inference(self, caikit_raw_inference_servic
             inference_service=caikit_raw_inference_service_scope_session,
             inference_config=CAIKIT_STANDALONE_INFERENCE_CONFIG,
             inference_type="embedding",
-            protocol=Protocols.HTTPS,
+            protocol=Protocols.HTTP,
             model_name=ModelName.CAIKIT_BGE_LARGE_EN,
             use_default_query=True,
         )