diff options
| author | Matt Clay <matt@mystile.com> | 2023-04-24 13:44:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-24 13:44:38 -0700 |
| commit | bbeb0bfbaffd3463fa732e61f7095449cd33bd9b (patch) | |
| tree | d0a0985f2fb602abd987e16ad49da4d59c843bf4 | |
| parent | ccabbcfae0230c2c43dcca487b91afaa77025c90 (diff) | |
| download | ansible-bbeb0bfbaffd3463fa732e61f7095449cd33bd9b.tar.gz | |
[stable-2.12] ansible-test - Use FreeBSD packaged setuptools (#80615) (#80619)
This will avoid issues during bootstrapping caused by breaking changes in setuptools.
(cherry picked from commit abc58c026b2e91af4a2bb57f7bfe21c609bd3de9)
| -rw-r--r-- | changelogs/fragments/ansible-test-freebsd-bootstrap-setuptools.yml | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_util/target/setup/bootstrap.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changelogs/fragments/ansible-test-freebsd-bootstrap-setuptools.yml b/changelogs/fragments/ansible-test-freebsd-bootstrap-setuptools.yml new file mode 100644 index 0000000000..bbf280fd4c --- /dev/null +++ b/changelogs/fragments/ansible-test-freebsd-bootstrap-setuptools.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - When bootstrapping remote FreeBSD instances, use the OS packaged ``setuptools`` instead of installing the latest version from PyPI. diff --git a/test/lib/ansible_test/_util/target/setup/bootstrap.sh b/test/lib/ansible_test/_util/target/setup/bootstrap.sh index 0427aac64f..049d773671 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -155,6 +155,7 @@ bootstrap_remote_freebsd() packages=" python${python_package_version} + py${python_package_version}-setuptools ${virtualenv_pkg} bash curl |