diff options
| author | Matt Clay <mclay@redhat.com> | 2021-01-25 13:37:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 15:37:30 -0600 |
| commit | c47ec375fa6adad82a3bd1848dcd3997f4504260 (patch) | |
| tree | 1087cde94c0c657e5e27a4d91b75fc9e8661ed1d | |
| parent | 1f90c11782c32a0c966ee2ac6ee76a5e3ea81f4a (diff) | |
| download | ansible-c47ec375fa6adad82a3bd1848dcd3997f4504260.tar.gz | |
[stable-2.10] Use a versioned pip bootstrapper in ansible-test. (#73359)
(cherry picked from commit fc590aeb2104c2c4e6a3aacba53852da1d7a26d9)
Co-authored-by: Matt Clay <matt@mystile.com>
| -rw-r--r-- | changelogs/fragments/ansible-test-pip-bootstrap-s3.yml | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/setup/remote.sh | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/changelogs/fragments/ansible-test-pip-bootstrap-s3.yml b/changelogs/fragments/ansible-test-pip-bootstrap-s3.yml new file mode 100644 index 0000000000..0015b6ca5b --- /dev/null +++ b/changelogs/fragments/ansible-test-pip-bootstrap-s3.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - The ``--remote`` option has been updated to use a versioned ``get-pip.py`` bootstrapper to avoid issues with future releases. diff --git a/test/lib/ansible_test/_data/setup/remote.sh b/test/lib/ansible_test/_data/setup/remote.sh index 26bec500c0..35167e21a1 100644 --- a/test/lib/ansible_test/_data/setup/remote.sh +++ b/test/lib/ansible_test/_data/setup/remote.sh @@ -11,11 +11,8 @@ cd ~/ install_pip () { if ! "${python_interpreter}" -m pip.__main__ --version --disable-pip-version-check 2>/dev/null; then case "${python_version}" in - "2.7") - pip_bootstrap_url="https://bootstrap.pypa.io/${python_version}/get-pip.py" - ;; *) - pip_bootstrap_url="https://bootstrap.pypa.io/get-pip.py" + pip_bootstrap_url="https://ansible-ci-files.s3.amazonaws.com/ansible-test/get-pip-20.3.4.py" ;; esac curl --silent --show-error "${pip_bootstrap_url}" -o /tmp/get-pip.py |