From 0b216c815abb14bc16d48fe9b0dd74f78ad4aad2 Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Fri, 7 Feb 2025 10:52:55 +0000 Subject: [PATCH] CI: Consolidate `apt-get install`s --- .ci/ansible_tests.py | 5 ----- .github/workflows/tests.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.ci/ansible_tests.py b/.ci/ansible_tests.py index 4a7bedae..6c78bb0c 100755 --- a/.ci/ansible_tests.py +++ b/.ci/ansible_tests.py @@ -71,11 +71,6 @@ with ci_lib.Fold('job_setup'): ci_lib.dump_file(inventory_path) - if not ci_lib.exists_in_path('sshpass'): - ci_lib.run("sudo apt-get update") - ci_lib.run("sudo apt-get install -y sshpass") - - with ci_lib.Fold('ansible'): playbook = os.environ.get('PLAYBOOK', 'all.yml') try: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a275a00..bbbc33e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -96,7 +96,7 @@ jobs: set -o errexit -o nounset -o pipefail sudo apt-get update - sudo apt-get install -y python2-dev python3-pip virtualenv + sudo apt-get install -y python2-dev python3-pip sshpass virtualenv - name: Show Python versions run: | set -o errexit -o nounset -o pipefail