saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 3006.x into master

Browse source
This commit is contained in:
Pedro Algarvio 2023-11-05 16:52:51 +00:00
commit ba85fb6c07
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
18 changed files with 61 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.pylintrc
View file

@ -697,7 +697,8 @@ allowed-3rd-party-modules=msgpack,
fnmatch,
ptscripts,
packaging,
looseversion
looseversion,
pytestskipmarkers
[EXCEPTIONS]

4
pkg/debian/salt-master.preinst
View file

@ -10,5 +10,9 @@ case "$1" in
find ${SALT_HOME} /etc/salt /var/log/salt /var/cache/salt /var/run/salt \
\! \( -path /etc/salt/cloud.deploy.d\* -o -path /var/log/salt/cloud -o -path /opt/saltstack/salt/lib/python${PY_VER}/site-packages/salt/cloud/deploy\* \) -a \
\( -user ${SALT_USER} -o -group ${SALT_GROUP} \) -exec chown root:root \{\} \;
# remove incorrectly installed ufw salt-master directory - issue 57712
test -d /etc/ufw/applications.d/salt-master && rm -rf /etc/ufw/applications.d/salt-master || /bin/true
;;
esac

8
requirements/static/ci/py3.10/darwin.txt
View file

@ -256,7 +256,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -275,7 +275,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -367,7 +367,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -554,7 +554,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

8
requirements/static/ci/py3.10/freebsd.txt
View file

@ -251,7 +251,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -270,7 +270,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -359,7 +359,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -540,7 +540,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

12
requirements/static/ci/py3.10/linux.txt
View file

@ -276,7 +276,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -295,7 +295,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -359,9 +359,9 @@ pyiface==0.0.11
# via -r requirements/static/ci/linux.in
pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
pyjwt==2.4.0
# via twilio
pymysql==1.0.3
pymysql==1.0.2
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -393,7 +393,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -604,7 +604,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

4
requirements/static/ci/py3.10/windows.txt
View file

@ -320,7 +320,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -489,7 +489,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

2
requirements/static/ci/py3.11/darwin.txt
View file

@ -273,7 +273,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator

2
requirements/static/ci/py3.11/freebsd.txt
View file

@ -268,7 +268,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator

2
requirements/static/ci/py3.11/linux.txt
View file

@ -291,7 +291,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator

4
requirements/static/ci/py3.11/windows.txt
View file

@ -312,13 +312,13 @@ pytest-helpers-namespace==2021.12.29
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
pytest-httpserver==1.0.6
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities

8
requirements/static/ci/py3.8/freebsd.txt
View file

@ -255,7 +255,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -274,7 +274,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -363,7 +363,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -544,7 +544,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

12
requirements/static/ci/py3.8/linux.txt
View file

@ -280,7 +280,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -299,7 +299,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -363,9 +363,9 @@ pyiface==0.0.11
# via -r requirements/static/ci/linux.in
pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
pyjwt==2.4.0
# via twilio
pymysql==1.0.3
pymysql==1.0.2
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -397,7 +397,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -608,7 +608,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

4
requirements/static/ci/py3.8/windows.txt
View file

@ -324,7 +324,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -494,7 +494,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

8
requirements/static/ci/py3.9/darwin.txt
View file

@ -256,7 +256,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -275,7 +275,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -367,7 +367,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -554,7 +554,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

8
requirements/static/ci/py3.9/freebsd.txt
View file

@ -251,7 +251,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -270,7 +270,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -359,7 +359,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -540,7 +540,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

12
requirements/static/ci/py3.9/linux.txt
View file

@ -278,7 +278,7 @@ msgpack==1.0.5
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
# pytest-salt-factories
multidict==6.0.4
multidict==6.0.2
# via
# aiohttp
# yarl
@ -297,7 +297,7 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
ntc-templates==3.4.0
ntc-templates==4.0.1
# via netmiko
oscrypto==1.3.0
# via certvalidator
@ -361,9 +361,9 @@ pyiface==0.0.11
# via -r requirements/static/ci/linux.in
pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
pyjwt==2.4.0
# via twilio
pymysql==1.0.3
pymysql==1.0.2
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -395,7 +395,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -606,7 +606,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

4
requirements/static/ci/py3.9/windows.txt
View file

@ -320,7 +320,7 @@ pytest-salt-factories==1.0.0rc27
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-skip-markers==1.4.1
pytest-skip-markers==1.5.0
# via
# pytest-salt-factories
# pytest-shell-utilities
@ -490,7 +490,7 @@ websocket-client==0.40.0
# kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==2.3.6
werkzeug==3.0.1
# via
# moto
# pytest-httpserver

8
tools/ci.py
View file

@ -641,8 +641,12 @@ def matrix(ctx: Context, distro_slug: str, full: bool = False, workflow: str = "
}
# On nightly and scheduled builds we don't want splits at all
if workflow.lower() in ("nightly", "scheduled"):
ctx.info(f"Clearning splits definition since workflow is '{workflow}'")
_splits.clear()
ctx.info(f"Reducing splits definition since workflow is '{workflow}'")
for key in _splits:
new_value = _splits[key] - 2
if new_value < 1:
new_value = 1
_splits[key] = new_value
for transport in ("zeromq", "tcp"):
if transport == "tcp":