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

Updated Amazon dependencies, and tests

Browse source
This commit is contained in:
David Murphy 2024-12-11 16:56:41 -07:00
parent 651d50aa05
commit 0075aa9902
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap-salt.sh
View file

@ -5731,7 +5731,7 @@ install_amazon_linux_ami_2_onedir_deps() {
# We need to install yum-utils before doing anything else when installing on # We need to install yum-utils before doing anything else when installing on
# Amazon Linux ECS-optimized images. See issue #974. # Amazon Linux ECS-optimized images. See issue #974.
__PACKAGES="yum-utils" __PACKAGES="yum-utils chkconfig procps-ng findutils"
# ensure sudo installed # ensure sudo installed
__PACKAGES="${__PACKAGES} sudo" __PACKAGES="${__PACKAGES} sudo"
@ -5919,7 +5919,7 @@ install_amazon_linux_ami_2023_onedir_deps() {
# We need to install yum-utils before doing anything else when installing on # We need to install yum-utils before doing anything else when installing on
# Amazon Linux ECS-optimized images. See issue #974. # Amazon Linux ECS-optimized images. See issue #974.
__PACKAGES="yum-utils" __PACKAGES="yum-utils chkconfig procps-ng findutils"
# ensure sudo installed # ensure sudo installed
__PACKAGES="${__PACKAGES} sudo" __PACKAGES="${__PACKAGES} sudo"

5
tests/integration/test_installation.py
View file

@ -42,11 +42,10 @@ def run_salt_call(cmd):
cmdl = [] cmdl = []
cmdl.extend(cmd) cmdl.extend(cmd)
cmdl.append("--out=json") cmdl.append("--out=json")
result = subprocess.run(cmdl, capture_output=True, text=True)
try: try:
result = subprocess.run(cmd, capture_output=True, text=True) result = subprocess.run(cmdl, capture_output=True, text=True)
except TypeError: except TypeError:
result = subprocess.run(cmd, text=True) result = subprocess.run(cmdl, text=True)
print(f"DGM run_salt_call result '{result}'", flush=True) print(f"DGM run_salt_call result '{result}'", flush=True)
if 0 == result.returncode: if 0 == result.returncode:
json_data = json.loads(result.stdout) json_data = json.loads(result.stdout)