From fc590aeb2104c2c4e6a3aacba53852da1d7a26d9 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 25 Jan 2021 11:50:42 -0800 Subject: [PATCH] Use a versioned pip bootstrapper in ansible-test. --- changelogs/fragments/ansible-test-pip-bootstrap-s3.yml | 2 ++ test/lib/ansible_test/_data/setup/remote.sh | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/ansible-test-pip-bootstrap-s3.yml 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 00000000000..0015b6ca5ba --- /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 05cb7c6061d..0ecfae5bc35 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