From ca50f8e141402876d98443f4367bc2936e1642f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 21 Feb 2026 16:28:55 +0100 Subject: [PATCH 1/3] tests: (re-)enable salt-ssh tests on newer Fedora/Ubuntu --- cicd/shared-gh-workflows-context.yml | 2 ++ tests/pytests/integration/netapi/test_ssh_client.py | 2 +- tests/pytests/integration/ssh/conftest.py | 5 +---- tools/ci.py | 1 + tools/precommit/workflows.py | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 30f28f4f1f37..3fd0288f079a 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -9,6 +9,8 @@ pr-testrun-slugs: - ubuntu-24.04 - rockylinux-9 - rockylinux-9-pkg + - fedora-42 + - fedora-42-pkg - windows-2025 - windows-2025-pkg - macos-15 diff --git a/tests/pytests/integration/netapi/test_ssh_client.py b/tests/pytests/integration/netapi/test_ssh_client.py index ce28663045c2..c07cc44fcf0c 100644 --- a/tests/pytests/integration/netapi/test_ssh_client.py +++ b/tests/pytests/integration/netapi/test_ssh_client.py @@ -15,7 +15,7 @@ pytest.mark.slow_test, pytest.mark.requires_sshd_server, pytest.mark.skipif( - 'grains["osfinger"].startswith(("Fedora Linux-40", "Ubuntu-24.04", "Arch Linux"))', + 'grains["osfinger"].startswith(("Arch Linux"))', reason="System ships with a version of python that is too recent for salt-ssh tests", # Actually, the problem is that the tornado we ship is not prepared for Python 3.12, # and it imports `ssl` and checks if the `match_hostname` function is defined, which diff --git a/tests/pytests/integration/ssh/conftest.py b/tests/pytests/integration/ssh/conftest.py index b08e57036114..3d07b6915c24 100644 --- a/tests/pytests/integration/ssh/conftest.py +++ b/tests/pytests/integration/ssh/conftest.py @@ -6,10 +6,7 @@ @pytest.fixture(scope="package", autouse=True) def _auto_skip_on_system_python_too_recent(grains): - if ( - grains["osfinger"] in ("Fedora Linux-40", "Ubuntu-24.04", "Debian-13") - or grains["os_family"] == "Arch" - ): + if grains["os_family"] == "Arch": pytest.skip( "System ships with a version of python that is too recent for salt-ssh tests", # Actually, the problem is that the tornado we ship is not prepared for Python 3.12, diff --git a/tools/ci.py b/tools/ci.py index fa9d3426c36e..2369a3d1a426 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -572,6 +572,7 @@ def _os_test_filter(osdef, transport, chunk, arm_runner, requested_slugs): "photonos-5-arm64", "ubuntu-22.04", "ubuntu-22.04-arm64", + "fedora-42", ): return False return True diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index df21e4b25364..b205d1250bc2 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -89,10 +89,10 @@ container="ghcr.io/saltstack/salt-ci-containers/testing:debian-13", ), Linux( - slug="fedora-40", - display_name="Fedora 40", + slug="fedora-42", + display_name="Fedora 42", arch="x86_64", - container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-40", + container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-42", ), # Linux(slug="opensuse-15", display_name="Opensuse 15", arch="x86_64"), Linux( From eebabc9e9e8b34c64d80161d10a4c74e668992ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 22 Feb 2026 04:49:38 +0100 Subject: [PATCH 2/3] [DO NOT MERGE] temporarily disable some tests platforms Speed up CI run, and also put less load on it. --- cicd/shared-gh-workflows-context.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 3fd0288f079a..f79b8d2c3d49 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -7,13 +7,13 @@ release_branches: pr-testrun-slugs: - ubuntu-24.04-pkg - ubuntu-24.04 - - rockylinux-9 - - rockylinux-9-pkg +# - rockylinux-9 +# - rockylinux-9-pkg - fedora-42 - fedora-42-pkg - - windows-2025 - - windows-2025-pkg - - macos-15 - - macos-15-pkg +# - windows-2025 +# - windows-2025-pkg +# - macos-15 +# - macos-15-pkg full-testrun-slugs: - all From 1b8eae376da9d287aa8342da5d7cc79bc73c88c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 22 Feb 2026 04:50:36 +0100 Subject: [PATCH 3/3] [DO NOT MERGE] un-mark ssh tests as slow let them run on PR workflow, without enabling all slow tests --- tests/pytests/integration/netapi/test_ssh_client.py | 2 +- tests/pytests/integration/ssh/state/test_pillar_override.py | 2 +- tests/pytests/integration/ssh/state/test_state.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/pytests/integration/netapi/test_ssh_client.py b/tests/pytests/integration/netapi/test_ssh_client.py index c07cc44fcf0c..c3cb47ee3a36 100644 --- a/tests/pytests/integration/netapi/test_ssh_client.py +++ b/tests/pytests/integration/netapi/test_ssh_client.py @@ -12,7 +12,7 @@ from tests.support.mock import patch pytestmark = [ - pytest.mark.slow_test, + # pytest.mark.slow_test, pytest.mark.requires_sshd_server, pytest.mark.skipif( 'grains["osfinger"].startswith(("Arch Linux"))', diff --git a/tests/pytests/integration/ssh/state/test_pillar_override.py b/tests/pytests/integration/ssh/state/test_pillar_override.py index c7f49b2b816d..6ec0d5bc6c35 100644 --- a/tests/pytests/integration/ssh/state/test_pillar_override.py +++ b/tests/pytests/integration/ssh/state/test_pillar_override.py @@ -13,7 +13,7 @@ pytestmark = [ pytest.mark.skip_on_windows(reason="salt-ssh not available on Windows"), pytest.mark.usefixtures("pillar_tree_nested"), - pytest.mark.slow_test, + # pytest.mark.slow_test, ] diff --git a/tests/pytests/integration/ssh/state/test_state.py b/tests/pytests/integration/ssh/state/test_state.py index f9fd126bb67c..2d533c211771 100644 --- a/tests/pytests/integration/ssh/state/test_state.py +++ b/tests/pytests/integration/ssh/state/test_state.py @@ -2,7 +2,7 @@ pytestmark = [ pytest.mark.skip_on_windows(reason="salt-ssh not available on Windows"), - pytest.mark.slow_test, + # pytest.mark.slow_test, ]