From 0075aa99027e611b00cb4a0dd350617b223e334c Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 11 Dec 2024 16:56:41 -0700 Subject: [PATCH] Updated Amazon dependencies, and tests --- bootstrap-salt.sh | 4 ++-- tests/integration/test_installation.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 893205d..59688d0 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5731,7 +5731,7 @@ install_amazon_linux_ami_2_onedir_deps() { # We need to install yum-utils before doing anything else when installing on # Amazon Linux ECS-optimized images. See issue #974. - __PACKAGES="yum-utils" + __PACKAGES="yum-utils chkconfig procps-ng findutils" # ensure sudo installed __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 # Amazon Linux ECS-optimized images. See issue #974. - __PACKAGES="yum-utils" + __PACKAGES="yum-utils chkconfig procps-ng findutils" # ensure sudo installed __PACKAGES="${__PACKAGES} sudo" diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py index e8ec2a7..2bc791a 100644 --- a/tests/integration/test_installation.py +++ b/tests/integration/test_installation.py @@ -42,11 +42,10 @@ def run_salt_call(cmd): cmdl = [] cmdl.extend(cmd) cmdl.append("--out=json") - result = subprocess.run(cmdl, capture_output=True, text=True) try: - result = subprocess.run(cmd, capture_output=True, text=True) + result = subprocess.run(cmdl, capture_output=True, text=True) except TypeError: - result = subprocess.run(cmd, text=True) + result = subprocess.run(cmdl, text=True) print(f"DGM run_salt_call result '{result}'", flush=True) if 0 == result.returncode: json_data = json.loads(result.stdout)