remove ansible from github tag install setup in test config files

pull/715/head
Steven Robertson 4 years ago
parent 33e176d62e
commit ce57e81b22

@ -11,10 +11,8 @@ batches = [
'pip install '
'-r tests/requirements.txt '
'-r tests/ansible/requirements.txt',
# '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
# encoding is required for installing ansible 2.10 with pip2, otherwise we get a UnicodeDecode error
'LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 pip install -q {}'.format(ci_lib.ANSIBLE_VERSION)
'LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 pip install -q ansible=={0}'.format(ci_lib.ANSIBLE_VERSION)
]
]
@ -24,8 +22,3 @@ 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')
ci_lib.run('ansible-galaxy collection install ansible.netcommon')
ci_lib.run('ansible-galaxy collection install ansible.posix')

@ -10,16 +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,
# ansible v2.10 isn't out yet so we're installing from github for now
'pip install -qqqU debops==2.1.2 {}'.format(ci_lib.ANSIBLE_VERSION)
'pip install -qqqU debops==2.1.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
],
[
'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')
ci_lib.run('ansible-galaxy collection install ansible.netcommon')
ci_lib.run('ansible-galaxy collection install ansible.posix')

@ -7,20 +7,13 @@ batches = [
# Must be installed separately, as PyNACL indirect requirement causes
# newer version to be installed if done in a single pip run.
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version.
'pip install "pycparser<2.19" "idna<2.7" virtualenv',
'pip install '
'-r tests/requirements.txt '
'-r tests/ansible/requirements.txt',
# 'pip install -q ansible=={}'.format(ci_lib.ANSIBLE_VERSION)
# ansible v2.10 isn't out yet so we're installing from github for now
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version.
'pip install -q {}'.format(ci_lib.ANSIBLE_VERSION)
'pip install -q ansible=={}'.format(ci_lib.ANSIBLE_VERSION)
]
]
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')
ci_lib.run('ansible-galaxy collection install ansible.netcommon')
ci_lib.run('ansible-galaxy collection install ansible.posix')

Loading…
Cancel
Save