ci: merge main branch

Author: rnetser

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: detect-secrets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.5
+    rev: v0.11.6
     hooks:
       - id: ruff
       - id: ruff-format

pyproject.toml

@@ -66,6 +66,7 @@ dependencies = [
     "openshift-python-wrapper>=11.0.38",
     "semver>=3.0.4",
     "pytest-order>=1.3.0",
+    "marshmallow==3.26.1",  # this version is needed for pytest-jira
 ]
 
 [project.urls]

pytest.ini

@@ -16,6 +16,7 @@ markers =
     pre_upgrade: Mark tests which should be run before upgrading the product.
     post_upgrade: Mark tests which should be run after upgrading the product.
     fuzzer: Mark tests that use fuzzing and are probably going to generate unanticipated failures.
+    ocp_interop: Interop testing with Openshift.
 
     # Model server
     modelmesh: Mark tests which are model mesh tests

tests/model_serving/model_server/authentication/test_kserve_token_authentication_raw.py

@@ -25,6 +25,7 @@
 )
 class TestKserveTokenAuthenticationRawForRest:
     @pytest.mark.smoke
+    @pytest.mark.ocp_interop
     @pytest.mark.dependency(name="test_model_authentication_using_rest_raw")
     def test_model_authentication_using_rest_raw(self, http_s3_caikit_raw_inference_service, http_raw_inference_token):
         """Verify RAW Kserve model query with token using REST"""

tests/model_serving/model_server/authentication/test_kserve_token_authentication_serverless.py

@@ -22,6 +22,7 @@
 )
 class TestKserveServerlessTokenAuthentication:
     @pytest.mark.smoke
+    @pytest.mark.ocp_interop
     @pytest.mark.dependency(name="test_model_authentication_using_rest")
     def test_model_authentication_using_rest(self, http_s3_caikit_serverless_inference_service, http_inference_token):
         """Verify model query with token using REST"""
@@ -36,6 +37,7 @@ def test_model_authentication_using_rest(self, http_s3_caikit_serverless_inferen
         )
 
     @pytest.mark.smoke
+    @pytest.mark.ocp_interop
     def test_model_authentication_using_grpc(self, grpc_s3_inference_service, grpc_inference_token):
         """Verify model query with token using GRPC"""
         verify_inference_response(

tests/model_serving/model_server/authentication/test_model_mesh_authentication.py

@@ -25,6 +25,7 @@
 class TestModelMeshAuthentication:
     """Model Mesh Authentication is based on the created Service; cross-model authentication is not blocked"""
 
+    @pytest.mark.ocp_interop
     @pytest.mark.dependency(name="test_model_mesh_model_authentication_openvino_inference_with_tensorflow")
     def test_model_mesh_model_authentication_openvino_inference_with_tensorflow(
         self,

tests/model_serving/model_server/components/test_model_serving_components.py

@@ -41,6 +41,7 @@ def component_deployment(
 
 
 @pytest.mark.smoke
+@pytest.mark.ocp_interop
 @pytest.mark.parametrize(
     "component_deployment",
     [

tests/model_serving/model_server/model_car/test_oci_image.py

@@ -42,6 +42,7 @@ def test_model_car_no_restarts(self, model_car_serverless_inference_service):
         assert not restarted_containers, f"Containers {restarted_containers} restarted"
 
     @pytest.mark.smoke
+    @pytest.mark.ocp_interop
     @pytest.mark.jira("RHOAIENG-12306")
     def test_model_car_using_rest(self, model_car_serverless_inference_service):
         """Verify model query with token using REST"""