diff --git a/changelog/68132.added.md b/changelog/68132.added.md new file mode 100644 index 00000000000..77fe116103a --- /dev/null +++ b/changelog/68132.added.md @@ -0,0 +1 @@ +Added Fedora 42 to test CI, and dropped Fedora 40, in accordance with Fedora OS support policy. diff --git a/requirements/pytest.txt b/requirements/pytest.txt index a8a26ea3892..d04065959ff 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -3,7 +3,7 @@ mock >= 3.0.0 docker >= 7.1.0; python_version >= '3.8' docker < 7.1.0; python_version < '3.8' pytest >= 7.2.0 -pytest-salt-factories >= 1.0.0 +pytest-salt-factories >= 1.0.5 pytest-helpers-namespace >= 2019.1.8 pytest-subtests pytest-timeout >= 2.3.1 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index a8a3b1a5cea..aaa63649f66 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -494,7 +494,7 @@ pytest-custom-exit-code==0.3.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt @@ -504,7 +504,7 @@ pytest-httpserver==1.0.8 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 099f8b94074..3b3ac2613f3 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -352,14 +352,14 @@ pyserial==3.4 # via junos-eznc pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 1e9f3fc5c26..b047a3c7fba 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -343,14 +343,14 @@ pyserial==3.4 # via junos-eznc pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 0c2fc81aeb1..499bc7514c4 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -361,14 +361,14 @@ pyserial==3.4 # via junos-eznc pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 4ff62d1fa84..a1b44c0572a 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -329,7 +329,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 075f2c714fc..04b97fb01d8 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -458,7 +458,7 @@ pytest-custom-exit-code==0.3.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt @@ -468,7 +468,7 @@ pytest-httpserver==1.0.8 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index bad5fdd2d1b..1caee35addf 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -323,14 +323,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 5c46a95194e..2a96d67934a 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -320,14 +320,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 444e7e0f602..f51d3105c96 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -338,14 +338,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index ae97b3d67a0..7b965c31351 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -325,7 +325,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index a0ce310466d..8cbe4b456e0 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -453,7 +453,7 @@ pytest-custom-exit-code==0.3.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt @@ -463,7 +463,7 @@ pytest-httpserver==1.0.8 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index f1940b54fdf..b51dbd8ae39 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -319,14 +319,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 79e87f93765..d7b49910159 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -316,14 +316,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 34e5ff724e9..f105ac76a5c 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -334,14 +334,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 91a891021c1..ce8e7ae4c04 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -321,7 +321,7 @@ pytest-helpers-namespace==2021.12.29 # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.9.7 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 373ba1260ec..1baf25d1fa3 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -530,7 +530,7 @@ pytest-custom-exit-code==0.3.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt @@ -540,7 +540,7 @@ pytest-httpserver==1.0.8 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 020c4a702e3..2afa435b273 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -381,14 +381,14 @@ pyserial==3.4 # netmiko pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 ; python_version <= "3.9" # via diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index db696a54679..d9ae58a0e55 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -372,14 +372,14 @@ pyserial==3.4 # netmiko pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 ; python_version <= "3.9" # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 9aa5f1faee4..90c5032ae0b 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -383,14 +383,14 @@ pyserial==3.4 # netmiko pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 ; python_version <= "3.9" # via diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 7953b26f8a4..1cf79b7bc68 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -324,14 +324,14 @@ pyrsistent==0.17.3 # via jsonschema pytest-custom-exit-code==0.3.0 # via -r requirements/pytest.txt -pytest-helpers-namespace==2021.4.29 +pytest-helpers-namespace==2021.12.29 # via # -r requirements/pytest.txt # pytest-salt-factories # pytest-shell-utilities pytest-httpserver==1.0.8 # via -r requirements/pytest.txt -pytest-salt-factories==1.0.1 +pytest-salt-factories==1.0.5 # via -r requirements/pytest.txt pytest-shell-utilities==1.8.0 ; python_version <= "3.9" # via diff --git a/tests/pytests/unit/modules/test_yumpkg.py b/tests/pytests/unit/modules/test_yumpkg.py index 04fa56986eb..5f9c977b22d 100644 --- a/tests/pytests/unit/modules/test_yumpkg.py +++ b/tests/pytests/unit/modules/test_yumpkg.py @@ -2477,7 +2477,7 @@ def test_get_yum_config(grains): # This one seems to be in all of them... # If this ever breaks in the future, we'll need to get more specific # than os_family - setting = "installonly_limit" + setting = "reposdir" result = yumpkg._get_yum_config() assert setting in result diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index 6d1691a7071..64b4aec2c0d 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -118,10 +118,10 @@ container="ghcr.io/saltstack/salt-ci-containers/testing:debian-12", ), 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( pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy