From 55c5a274cc888ace4537b281542a684834052f2c Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Thu, 3 Sep 2020 22:20:51 -0700 Subject: [PATCH] install community.general collection --- .ci/ansible_install.py | 3 +++ .ci/ansible_tests.py | 3 +++ .ci/debops_common_install.py | 3 +++ .ci/localhost_ansible_install.py | 3 +++ .ci/localhost_ansible_tests.py | 3 +++ 5 files changed, 15 insertions(+) diff --git a/.ci/ansible_install.py b/.ci/ansible_install.py index 9e717288..7678eb45 100755 --- a/.ci/ansible_install.py +++ b/.ci/ansible_install.py @@ -23,3 +23,6 @@ batches.extend( ) ci_lib.run_batches(batches) + +# after ansible is installed, install common collections until ansible==2.10 comes out +ci_lib.run('ansible-galaxy collection install community.general') \ No newline at end of file diff --git a/.ci/ansible_tests.py b/.ci/ansible_tests.py index c2cb0126..bcde675e 100755 --- a/.ci/ansible_tests.py +++ b/.ci/ansible_tests.py @@ -42,6 +42,9 @@ with ci_lib.Fold('job_setup'): # ansible v2.10 isn't out yet so we're installing from github for now run('pip install -q {}'.format(ci_lib.ANSIBLE_VERSION)) + # after ansible is installed, install common collections until ansible==2.10 comes out + run('ansible-galaxy collection install community.general') + os.chdir(TESTS_DIR) os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7)) diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py index da8ea673..b75cb80f 100755 --- a/.ci/debops_common_install.py +++ b/.ci/debops_common_install.py @@ -18,3 +18,6 @@ ci_lib.run_batches([ 'docker pull %s' % (ci_lib.image_for_distro('debian'),), ], ]) + +# after ansible is installed, install common collections until ansible==2.10 comes out +ci_lib.run('ansible-galaxy collection install community.general') diff --git a/.ci/localhost_ansible_install.py b/.ci/localhost_ansible_install.py index 4494af4c..87bb18e7 100755 --- a/.ci/localhost_ansible_install.py +++ b/.ci/localhost_ansible_install.py @@ -18,3 +18,6 @@ batches = [ ] ci_lib.run_batches(batches) + +# after ansible is installed, install common collections until ansible==2.10 comes out +ci_lib.run('ansible-galaxy collection install community.general') \ No newline at end of file diff --git a/.ci/localhost_ansible_tests.py b/.ci/localhost_ansible_tests.py index 69e2628e..89ea3457 100755 --- a/.ci/localhost_ansible_tests.py +++ b/.ci/localhost_ansible_tests.py @@ -25,6 +25,9 @@ with ci_lib.Fold('job_setup'): # ansible v2.10 isn't out yet so we're installing from github for now run('pip install -q virtualenv {}'.format(ci_lib.ANSIBLE_VERSION)) + # after ansible is installed, install common collections until ansible==2.10 comes out + run('ansible-galaxy collection install community.general') + os.chmod(KEY_PATH, int('0600', 8)) if not ci_lib.exists_in_path('sshpass'): run("brew install http://git.io/sshpass.rb")