fix ansible install, also TODO: why do we have 3 almost the same install scripts...

pull/715/head
Steven Robertson 4 years ago
parent 130e111f21
commit 5dee6fb891

@ -11,7 +11,9 @@ batches = [
'pip install ' 'pip install '
'-r tests/requirements.txt ' '-r tests/requirements.txt '
'-r tests/ansible/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)
] ]
] ]

@ -38,7 +38,9 @@ with ci_lib.Fold('docker_setup'):
with ci_lib.Fold('job_setup'): with ci_lib.Fold('job_setup'):
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version. # 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.chdir(TESTS_DIR)
os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7)) os.chmod('../data/docker/mitogen__has_sudo_pubkey.key', int('0600', 7))

@ -11,7 +11,9 @@ batches = [
'pip install ' 'pip install '
'-r tests/requirements.txt ' '-r tests/requirements.txt '
'-r tests/ansible/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)
] ]
] ]

Loading…
Cancel
Save