From 5dee6fb8917946b46d0156211975099d6187114b Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Thu, 3 Sep 2020 21:50:19 -0700 Subject: [PATCH] fix ansible install, also TODO: why do we have 3 almost the same install scripts... --- .ci/ansible_install.py | 4 +++- .ci/ansible_tests.py | 4 +++- .ci/localhost_ansible_install.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.ci/ansible_install.py b/.ci/ansible_install.py index ff2d3b63..9e717288 100755 --- a/.ci/ansible_install.py +++ b/.ci/ansible_install.py @@ -11,7 +11,9 @@ batches = [ 'pip install ' '-r tests/requirements.txt ' '-r tests/ansible/requirements.txt', - 'pip install -q ansible=={0}'.format(ci_lib.ANSIBLE_VERSION) + # 'pip install -q ansible=={0}'.format(ci_lib.ANSIBLE_VERSION) + # ansible v2.10 isn't out yet so we're installing from github for now + 'pip install -q {}'.format(ci_lib.ANSIBLE_VERSION) ] ] diff --git a/.ci/ansible_tests.py b/.ci/ansible_tests.py index 4df2dc70..c2cb0126 100755 --- a/.ci/ansible_tests.py +++ b/.ci/ansible_tests.py @@ -38,7 +38,9 @@ with ci_lib.Fold('docker_setup'): with ci_lib.Fold('job_setup'): # Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version. - run("pip install -q ansible==%s", ci_lib.ANSIBLE_VERSION) + # run("pip install -q ansible==%s", ci_lib.ANSIBLE_VERSION) + # ansible v2.10 isn't out yet so we're installing from github for now + run('pip install -q {}'.format(ci_lib.ANSIBLE_VERSION)) os.chdir(TESTS_DIR) os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7)) diff --git a/.ci/localhost_ansible_install.py b/.ci/localhost_ansible_install.py index f8a1dd17..4494af4c 100755 --- a/.ci/localhost_ansible_install.py +++ b/.ci/localhost_ansible_install.py @@ -11,7 +11,9 @@ batches = [ 'pip install ' '-r tests/requirements.txt ' '-r tests/ansible/requirements.txt', - 'pip install -q ansible=={}'.format(ci_lib.ANSIBLE_VERSION) + # 'pip install -q ansible=={}'.format(ci_lib.ANSIBLE_VERSION) + # ansible v2.10 isn't out yet so we're installing from github for now + 'pip install -q {}'.format(ci_lib.ANSIBLE_VERSION) ] ]