mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Merge 3006.x into master
This commit is contained in:
Pedro Algarvio
commit
5e093b3b8d
41 changed files with 50 additions and 48 deletions
1
changelog/64377.fixed.md
Normal file
1
changelog/64377.fixed.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
Fix salt user login shell path in Debian packages
|
||||
|
|
@ -14,10 +14,6 @@ def test_help(install_salt):
|
|||
# Singlebin build, unable to get the version
|
||||
continue
|
||||
|
||||
# TODO: Remove this condition once the fixed 3005.x classic packages are released.
|
||||
if "salt-proxy" in cmd[0] and platform.is_darwin() and install_salt.classic:
|
||||
continue
|
||||
|
||||
if "python" in cmd[0] and len(cmd) == 1:
|
||||
ret = install_salt.proc.run(
|
||||
*cmd, "--version", stdout=subprocess.PIPE, stderr=subprocess.PIPE
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ urllib3==1.26.6
|
|||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -617,7 +617,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ packaging==23.1
|
|||
# -r requirements/base.txt
|
||||
# docker
|
||||
# pytest
|
||||
platformdirs==3.5.3
|
||||
platformdirs==2.6.2
|
||||
# via virtualenv
|
||||
pluggy==1.0.0
|
||||
# via pytest
|
||||
|
|
@ -148,13 +148,13 @@ typing-extensions==4.6.3
|
|||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
# pytest-system-statistics
|
||||
urllib3==2.0.3
|
||||
urllib3==1.26.14
|
||||
# via
|
||||
# docker
|
||||
# requests
|
||||
virtualenv==20.23.0
|
||||
# via pytest-salt-factories
|
||||
websocket-client==1.5.3
|
||||
websocket-client==0.40.0
|
||||
# via docker
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ yamllint==1.32.0
|
|||
# via -r requirements/static/ci/windows.in
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ urllib3==1.26.6
|
|||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -611,7 +611,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -153,11 +153,11 @@ typing-extensions==4.6.3
|
|||
# pytest-system-statistics
|
||||
urllib3==1.26.14
|
||||
# via requests
|
||||
virtualenv==20.18.0
|
||||
virtualenv==20.23.0
|
||||
# via pytest-salt-factories
|
||||
wmi==1.5.1 ; sys_platform == "win32"
|
||||
# via -r requirements/static/ci/pkgtests-windows.in
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -148,11 +148,11 @@ urllib3==1.26.14
|
|||
# via
|
||||
# docker
|
||||
# requests
|
||||
virtualenv==20.17.1
|
||||
virtualenv==20.23.0
|
||||
# via pytest-salt-factories
|
||||
websocket-client==1.5.1
|
||||
websocket-client==0.40.0
|
||||
# via docker
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ yamllint==1.32.0
|
|||
# via -r requirements/static/ci/windows.in
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ urllib3==1.26.6
|
|||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -621,7 +621,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -515,7 +515,7 @@ yamllint==1.32.0
|
|||
# via -r requirements/static/ci/windows.in
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ urllib3==1.26.6
|
|||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -619,7 +619,7 @@ yamlordereddictloader==0.4.0
|
|||
# via junos-eznc
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ yamllint==1.32.0
|
|||
# via -r requirements/static/ci/windows.in
|
||||
yarl==1.9.2
|
||||
# via aiohttp
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# cherrypy
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ urllib3==1.26.6
|
|||
# via requests
|
||||
vultr==1.0.1
|
||||
# via -r requirements/darwin.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ wheel==0.38.4
|
|||
# via -r requirements/windows.txt
|
||||
wmi==1.5.1
|
||||
# via -r requirements/windows.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ urllib3==1.26.6
|
|||
# via requests
|
||||
vultr==1.0.1
|
||||
# via -r requirements/darwin.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ wheel==0.38.4
|
|||
# via -r requirements/windows.txt
|
||||
wmi==1.5.1
|
||||
# via -r requirements/windows.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ wheel==0.38.4
|
|||
# via -r requirements/windows.txt
|
||||
wmi==1.5.1
|
||||
# via -r requirements/windows.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ urllib3==1.26.6
|
|||
# via requests
|
||||
vultr==1.0.1
|
||||
# via -r requirements/darwin.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ typing-extensions==4.6.3
|
|||
# via pydantic
|
||||
urllib3==1.26.6
|
||||
# via requests
|
||||
zc.lockfile==1.4
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ wheel==0.38.4
|
|||
# via -r requirements/windows.txt
|
||||
wmi==1.5.1
|
||||
# via -r requirements/windows.txt
|
||||
zc.lockfile==2.0
|
||||
zc.lockfile==3.0.post1
|
||||
# via cherrypy
|
||||
zipp==3.15.0
|
||||
# via importlib-metadata
|
||||
|
|
|
|||
|
|
@ -323,6 +323,9 @@ salt/(minion\.py|channel/.+|transport/.+):
|
|||
tests/support/mock.py:
|
||||
- unit.test_mock
|
||||
|
||||
tests/support/virt.py:
|
||||
- pytests.integration.modules.test_virt
|
||||
|
||||
tests/support/pytest/mysql.py:
|
||||
- pytests.functional.states.test_mysql
|
||||
- pytests.functional.modules.test_mysql
|
||||
|
|
|
|||
|
|
@ -66,7 +66,8 @@ def virt_minion_0(
|
|||
"extra_hosts": {
|
||||
virt_minion_0_id: "127.0.0.1",
|
||||
virt_minion_1_id: "127.0.0.1",
|
||||
}
|
||||
},
|
||||
"cgroupns": "host",
|
||||
},
|
||||
pull_before_start=True,
|
||||
skip_on_pull_failure=True,
|
||||
|
|
@ -103,7 +104,8 @@ def virt_minion_1(
|
|||
"extra_hosts": {
|
||||
virt_minion_0_id: "127.0.0.1",
|
||||
virt_minion_1_id: "127.0.0.1",
|
||||
}
|
||||
},
|
||||
"cgroupns": "host",
|
||||
},
|
||||
pull_before_start=True,
|
||||
skip_on_pull_failure=True,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue