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

Revert unwanted changes dependent on other PRs

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-05-22 14:05:36 -07:00 • committed by Gareth J. Greenaway
parent 5ad05c61cf
commit 356120f91a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/topics/releases/index.rst
View file

@ -19,7 +19,7 @@ Upcoming release
:maxdepth: 1
:glob:
3006.*
3007.*
See `Install a release candidate <https://docs.saltproject.io/salt/install-guide/en/latest/topics/release-candidate.html>`_
for more information about installing an RC when one is available.
@ -31,6 +31,7 @@ Previous releases
:maxdepth: 1
:glob:
3006.*
3005*
3004*
3003*

2
tools/vm.py
View file

@ -450,8 +450,6 @@ def install_dependencies(ctx: Context, name: str, nox_session: str = "ci-test-3"
Install test dependencies on VM.
"""
vm = VM(ctx=ctx, name=name, region_name=ctx.parser.options.region)
if name == "amazonlinux-2":
vm.run(["sudo", "yum", "install", "-y", "libffi-devel"])
returncode = vm.install_dependencies(nox_session)
ctx.exit(returncode)