From 1ded60e09731308de6eb4bf0d44470522320a673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Je=C5=99=C3=A1bek=20=28Jiri=20Jerabek=29?= Date: Thu, 22 Aug 2024 13:05:57 +0200 Subject: [PATCH] Skip 2.5 tests in 2.4 pipelines (#2235) skip 2.5 tests in 2.4 pipelines No-Issue --- galaxy_ng/tests/integration/api/test_ui_paths.py | 2 +- galaxy_ng/tests/integration/dab/test_dab_rbac.py | 3 +++ galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py | 8 ++++++++ .../tests/integration/dab/test_dab_rbac_pagination.py | 1 + galaxy_ng/tests/integration/dab/test_ui_v2.py | 5 +++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/galaxy_ng/tests/integration/api/test_ui_paths.py b/galaxy_ng/tests/integration/api/test_ui_paths.py index 69e96d3d9a..cfc178c85c 100644 --- a/galaxy_ng/tests/integration/api/test_ui_paths.py +++ b/galaxy_ng/tests/integration/api/test_ui_paths.py @@ -765,7 +765,7 @@ def test_api_ui_v1_collection_detail_view(ansible_config, published): # /api/automation-hub/_ui/v1/settings/ @pytest.mark.deployment_standalone @pytest.mark.api_ui -@pytest.mark.min_hub_version("4.6dev") +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.skip_in_gw def test_api_ui_v1_settings(ansible_config): diff --git a/galaxy_ng/tests/integration/dab/test_dab_rbac.py b/galaxy_ng/tests/integration/dab/test_dab_rbac.py index fd73bf5246..4d16dc314f 100644 --- a/galaxy_ng/tests/integration/dab/test_dab_rbac.py +++ b/galaxy_ng/tests/integration/dab/test_dab_rbac.py @@ -295,6 +295,7 @@ def test_dab_rbac_namespace_owner_by_user_or_team( os.environ.get('JWT_PROXY') is not None, reason="Skipped because jwt proxy is in use" ) +@pytest.mark.min_hub_version("4.10dev") def test_dab_user_platform_auditor_bidirectional_sync( settings, galaxy_client, @@ -387,6 +388,7 @@ def test_dab_user_platform_auditor_bidirectional_sync( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_dab_team_platform_auditor_bidirectional_sync( settings, galaxy_client, @@ -489,6 +491,7 @@ def test_dab_team_platform_auditor_bidirectional_sync( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_dab_user_assignment_filtering_as_user( settings, galaxy_client, diff --git a/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py b/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py index 3fdbfbdcbf..6923f4f7ef 100644 --- a/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py +++ b/galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py @@ -11,6 +11,7 @@ # This tests the basic DAB RBAC contract using custom roles to do things. @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_list_namespace_permissions(galaxy_client): gc = galaxy_client("admin") r = gc.get("_ui/v2/role_metadata/") @@ -30,6 +31,7 @@ def test_list_namespace_permissions(galaxy_client): # look for the content_type choices @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_role_definition_options(galaxy_client): gc = galaxy_client("admin") # TODO: add support for options in GalaxyClient in galaxykit @@ -220,6 +222,7 @@ def check_system_role_user_assignments(client: GalaxyClient, user: dict, role: d @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("by_api", ["dab", "pulp"]) def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_client, by_api): if by_api == "dab": @@ -242,6 +245,7 @@ def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_c @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_give_user_custom_role_system(galaxy_client, custom_role_factory, namespace): # TODO: verify that assignment is seen in pulp API (HOW?) # Step 0: Setup test. @@ -306,6 +310,7 @@ def test_give_user_custom_role_system(galaxy_client, custom_role_factory, namesp @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_give_team_custom_role_system( settings, galaxy_client, @@ -378,6 +383,7 @@ def test_give_team_custom_role_system( # TODO: We need another version of it for a team @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("by_role_api", ["dab", "pulp"]) @pytest.mark.parametrize("by_assignment_api", ["dab", "pulp"]) def test_give_user_custom_role_object( @@ -554,6 +560,7 @@ def test_give_team_custom_role_object( assert ctx.value.response.status_code == HTTPStatus.FORBIDDEN +@pytest.mark.min_hub_version("4.10dev") def test_object_role_permission_validation(galaxy_client, custom_role_factory, namespace): gc = galaxy_client("admin") @@ -629,6 +636,7 @@ def assure_user_not_in_group(): return (user, group) +@pytest.mark.min_hub_version("4.10dev") def test_group_sync_from_pulp_to_dab(galaxy_client, assert_user_in_group, user_and_group): gc = galaxy_client("admin") user, group = user_and_group diff --git a/galaxy_ng/tests/integration/dab/test_dab_rbac_pagination.py b/galaxy_ng/tests/integration/dab/test_dab_rbac_pagination.py index d69ea974ef..aadb919c52 100644 --- a/galaxy_ng/tests/integration/dab/test_dab_rbac_pagination.py +++ b/galaxy_ng/tests/integration/dab/test_dab_rbac_pagination.py @@ -5,6 +5,7 @@ @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_dab_rbac_pagination(galaxy_client): gc = galaxy_client("admin", ignore_cache=True) roledefs = gc.get('_ui/v2/role_definitions/?page_size=1') diff --git a/galaxy_ng/tests/integration/dab/test_ui_v2.py b/galaxy_ng/tests/integration/dab/test_ui_v2.py index bd00c7de9c..0213d1a541 100644 --- a/galaxy_ng/tests/integration/dab/test_ui_v2.py +++ b/galaxy_ng/tests/integration/dab/test_ui_v2.py @@ -11,6 +11,7 @@ @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("user_payload", [ {}, {"email": "foobar@foobar.com"}, @@ -61,6 +62,7 @@ def test_ui_v2_user_create( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("user_payload", [ {"groups": [{"name": "$RANDOM"}]}, {"teams": [{"name": "$RANDOM", "organization": "$RANDOM"}]}, @@ -170,6 +172,7 @@ def test_ui_v2_user_create_with_groups_and_teams_and_orgs( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("invalid_payload", [ ({"email": "invalidemail"}, "Enter a valid email address."), ({"email": "@whoops"}, "Enter a valid email address."), @@ -214,6 +217,7 @@ def test_ui_v2_user_create_invalid_data( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") def test_ui_v2_user_edit( settings, galaxy_client, @@ -256,6 +260,7 @@ def test_ui_v2_user_edit( @pytest.mark.deployment_standalone +@pytest.mark.min_hub_version("4.10dev") @pytest.mark.parametrize("invalid_payload", [ ({"email": "invalidemail"}, "Enter a valid email address."), ({"email": "@whoops"}, "Enter a valid email address."),