diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py index 32241449..da8ea673 100755 --- a/.ci/debops_common_install.py +++ b/.ci/debops_common_install.py @@ -10,7 +10,9 @@ ci_lib.run_batches([ # Must be installed separately, as PyNACL indirect requirement causes # newer version to be installed if done in a single pip run. 'pip install "pycparser<2.19"', - 'pip install -qqqU debops==0.7.2 ansible==%s' % ci_lib.ANSIBLE_VERSION, + # 'pip install -qqqU debops==0.7.2 ansible==%s' % ci_lib.ANSIBLE_VERSION, + # ansible v2.10 isn't out yet so we're installing from github for now + 'pip install -qqqU debops==0.7.2 {}'.format(ci_lib.ANSIBLE_VERSION) ], [ 'docker pull %s' % (ci_lib.image_for_distro('debian'),), diff --git a/.ci/localhost_ansible_tests.py b/.ci/localhost_ansible_tests.py index b4d6a542..71521131 100755 --- a/.ci/localhost_ansible_tests.py +++ b/.ci/localhost_ansible_tests.py @@ -21,7 +21,9 @@ with ci_lib.Fold('unit_tests'): 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 virtualenv ansible==%s", ci_lib.ANSIBLE_VERSION) + # run("pip install -q virtualenv 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 virtualenv {}'.format(ci_lib.ANSIBLE_VERSION) os.chmod(KEY_PATH, int('0600', 8)) if not ci_lib.exists_in_path('sshpass'):