diff options
| author | Matt Davis <nitzmahone@users.noreply.github.com> | 2021-02-10 21:32:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 21:32:59 -0800 |
| commit | 4c5ce5a1a9e79a845aff4978cfeb72a0d4ecf7d6 (patch) | |
| tree | a1511f836f61f9f662d5b3a3c0231c9a02aa7eeb /test/utils/shippable | |
| parent | 8a175f59c939ca29ad56f3fa9edbc37a8656879a (diff) | |
| download | ansible-4c5ce5a1a9e79a845aff4978cfeb72a0d4ecf7d6.tar.gz | |
module compat for py3.8+ controller (#73423)
* module compat for py3.8+ controller
* replaced internal usages of selinux bindings with internal ctypes binding (allows basic selinux operations from any Python interpreter), plus tests
* added new respawn_module API to allow modules to import Python packages that are only available under a well-known interpreter, plus tests
* added respawn logic to modules that need Python libs from a specific system interpreter (apt, apt_repository, dnf, yum)
minimize internal HAVE_SELINUX usage
spurious junk
pep8
* pylint fixes
* add RHEL8 Python 3.8 testing
* more pylint
* import sanity
* unit tests
* changelog update
* fix a bunch of stuff
* tweak changelog
* fix setup_rpm_repo on EL8
* misc sanity/test fixes
* misc feedback tweaks
* fix import fallback in test module
* fix selinux MU test
* fix dnf tests to avoid python-dependent test packages
* add trailing LFs to aliases
* fix yum tests to avoid test package with Python deps
* hack create_repo for EL6 to create noarch package
Diffstat (limited to 'test/utils/shippable')
| -rwxr-xr-x | test/utils/shippable/incidental/remote.sh | 13 | ||||
| -rwxr-xr-x | test/utils/shippable/remote.sh | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/test/utils/shippable/incidental/remote.sh b/test/utils/shippable/incidental/remote.sh index 0d4e0312ab..95f304d54a 100755 --- a/test/utils/shippable/incidental/remote.sh +++ b/test/utils/shippable/incidental/remote.sh @@ -7,12 +7,21 @@ IFS='/:' read -ra args <<< "$1" platform="${args[0]}" version="${args[1]}" - +pyver=default target="shippable/posix/incidental/" +# check for explicit python version like 8.3@3.8 +declare -a splitversion +IFS='@' read -ra splitversion <<< "$version" + +if [ "${#splitversion[@]}" -gt 1 ]; then + version="${splitversion[0]}" + pyver="${splitversion[1]}" +fi + stage="${S:-prod}" provider="${P:-default}" # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" \ + --python "${pyver}" --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" \ diff --git a/test/utils/shippable/remote.sh b/test/utils/shippable/remote.sh index cd3014ccac..b64e0d46fc 100755 --- a/test/utils/shippable/remote.sh +++ b/test/utils/shippable/remote.sh @@ -7,6 +7,16 @@ IFS='/:' read -ra args <<< "$1" platform="${args[0]}" version="${args[1]}" +pyver=default + +# check for explicit python version like 8.3@3.8 +declare -a splitversion +IFS='@' read -ra splitversion <<< "$version" + +if [ "${#splitversion[@]}" -gt 1 ]; then + version="${splitversion[0]}" + pyver="${splitversion[1]}" +fi if [ "${#args[@]}" -gt 2 ]; then target="shippable/posix/group${args[2]}/" @@ -19,4 +29,4 @@ provider="${P:-default}" # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" + --python "${pyver}" --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" \ |