Merge branch 'main' into secrets

jgarciao · web-flow · commit 67ea60169c9b · 2026-03-19T16:04:04.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -70,7 +70,7 @@ dependencies = [
     "semver>=3.0.4",
     "sqlalchemy>=2.0.40",
     "pytest-order>=1.3.0",
-    "marshmallow==3.26.2,<4", # this version is needed for pytest-jira
+    "marshmallow>=4.0",
     "pytest-html>=4.1.1",
     "fire",
     "llama_stack_client>=0.6.0,<0.7",
diff --git a/pytest.ini b/pytest.ini
@@ -64,3 +64,5 @@ addopts =
     --tc-file=tests/global_config.py
     --tc-format=python
     --jira
+    --jira-connection-error-strategy=skip
+    --jira-disable-docs-search
diff --git a/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py b/tests/model_registry/model_catalog/huggingface/test_huggingface_models_multiple_sources.py
@@ -123,7 +123,7 @@ def test_external_id_has_no_namespace_prefix(
     @pytest.mark.parametrize(
         "filter_field",
         [
-            pytest.param("name", id="filter_by_name", marks=pytest.mark.xfail(reason="RHOAIENG-53498")),
+            pytest.param("name", id="filter_by_name"),
             pytest.param("externalId", id="filter_by_external_id"),
         ],
     )
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ def test_external_id_has_no_namespace_prefix(`
`123`	`123`	`@pytest.mark.parametrize(`
`124`	`124`	`"filter_field",`
`125`	`125`	`[`
`126`		`- pytest.param("name", id="filter_by_name", marks=pytest.mark.xfail(reason="RHOAIENG-53498")),`
	`126`	`+ pytest.param("name", id="filter_by_name"),`
`127`	`127`	`pytest.param("externalId", id="filter_by_external_id"),`
`128`	`128`	`],`
`129`	`129`	`)`