fix custom_python_new_style_missing_interpreter, looks like Ansible 2.10 changed how new-style module detection works

This commit is contained in:
Steven Robertson 2020-10-25 13:48:54 -07:00
parent ae4f6ece41
commit cf3d646613
3 changed files with 7 additions and 6 deletions

View File

@ -10,9 +10,11 @@ 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==2.1.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
'pip install -q ansible==%s' % ci_lib.ANSIBLE_VERSION,
],
[
'docker pull %s' % (ci_lib.image_for_distro('debian'),),
],
])
ci_lib.run('ansible-galaxy collection install debops.debops:==2.1.2')

View File

@ -21,13 +21,12 @@ install:
- pip install -U pip==20.2.1
- .ci/${MODE}_install.py
# Travis has a 4MB log limit (https://github.com/travis-ci/travis-ci/issues/1382), but verbose Mitogen logs run larger than that
# in order to keep verbosity to debug a build failure, will run with this workaround: https://stackoverflow.com/a/26082445
script:
- .ci/spawn_reverse_shell.py
- MODE=${MODE} .ci/travis.sh
# Travis has a 4MB log limit (https://github.com/travis-ci/travis-ci/issues/1382), but verbose Mitogen logs run larger than that
# in order to keep verbosity to debug a build failure, will run with this workaround: https://stackoverflow.com/a/26082445
# To avoid matrix explosion, just test against oldest->newest and
# newest->oldest in various configuartions.

View File

@ -2,8 +2,8 @@
import sys
# This is the magic marker Ansible looks for:
# from ansible.module_utils.
# As of Ansible 2.10, Ansible changed new-style detection: # https://github.com/ansible/ansible/pull/61196/files#diff-5675e463b6ce1fbe274e5e7453f83cd71e61091ea211513c93e7c0b4d527d637L828-R980
# from ansible.module_utils import basic
def usage():