Merge branch 'master' into DAB_USER_PREFIXES

.sonarcloud.properties

@@ -1,7 +1,8 @@
 sonar.sources = galaxy_ng
-sonar.exclusions = galaxy_ng/tests/**/*
+sonar.exclusions = \
+  galaxy_ng/tests/**, \
+  galaxy_ng/_vendor/**
 
 sonar.tests = galaxy_ng/tests
 
 sonar.python.version = 3.11
-

galaxy_ng/tests/integration/dab/test_dab_rbac.py

@@ -42,6 +42,7 @@ def test_dab_roledefs_match_pulp_roles(galaxy_client):
 
 
 @pytest.mark.deployment_standalone
+@pytest.mark.min_hub_version("4.10dev")
 @pytest.mark.skipif(
     os.environ.get('JWT_PROXY') is not None,
     reason="Skipped because jwt proxy is in use"
@@ -140,6 +141,7 @@ def test_dab_rbac_repository_owner_by_user_or_team(
 
 
 @pytest.mark.deployment_standalone
+@pytest.mark.min_hub_version("4.10dev")
 @pytest.mark.skipif(
     os.environ.get('JWT_PROXY') is not None,
     reason="Skipped because jwt proxy is in use"
@@ -549,6 +551,7 @@ def test_dab_user_assignment_filtering_as_user(
 
 
 @pytest.mark.deployment_standalone
+@pytest.mark.min_hub_version("4.10dev")
 @pytest.mark.skipif(
     os.environ.get('JWT_PROXY') is not None,
     reason="Skipped because jwt proxy is in use"

galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py

@@ -457,6 +457,7 @@ def test_give_user_custom_role_object(
     assert_object_role_assignments(admin_client, user, namespace, 0)
 
 
+@pytest.mark.min_hub_version("4.10dev")
 @pytest.mark.deployment_standalone
 def test_give_team_custom_role_object(
     settings,
@@ -669,6 +670,7 @@ def test_team_member_sync_from_dab_to_pulp(galaxy_client, assert_user_in_group,
     assert_user_in_group(user["id"], group["id"], expected=True)
 
 
+@pytest.mark.min_hub_version("4.10dev")
 def test_team_members_are_migrated(galaxy_client, assert_user_in_group):
     "Make sure any existing team memberships are correct"
     gc = galaxy_client("admin")