cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[stable-2.10] Use a versioned pip bootstrapper in ansible-test. (#73359)

Browse source 
(cherry picked from commit fc590aeb21)

Co-authored-by: Matt Clay <matt@mystile.com>
This commit is contained in:
Matt Clay 2021-01-25 13:37:30 -08:00 committed by GitHub
parent 1f90c11782
commit c47ec375fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ansible-test-pip-bootstrap-s3.yml Normal file
View file

@ -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.

5
test/lib/ansible_test/_data/setup/remote.sh
View file

@ -11,11 +11,8 @@ cd ~/
install_pip () { install_pip () {
if ! "${python_interpreter}" -m pip.__main__ --version --disable-pip-version-check 2>/dev/null; then if ! "${python_interpreter}" -m pip.__main__ --version --disable-pip-version-check 2>/dev/null; then
case "${python_version}" in 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 esac
curl --silent --show-error "${pip_bootstrap_url}" -o /tmp/get-pip.py curl --silent --show-error "${pip_bootstrap_url}" -o /tmp/get-pip.py