ansible-test - Remove more Python 2.7 support.

pull/74774/merge
Matt Clay 3 years ago
parent 3b0d74c145
commit 191d9a771a

@ -0,0 +1,3 @@
minor_changes:
- ansible-test - Remove support for Python 2.7 on provisioned FreeBSD instances.
- ansible-test - Remove the ``opensuse15py2`` container.

@ -5,7 +5,6 @@ alpine3 image=quay.io/ansible/alpine3-test-container:3.3.0 python=3.9
centos7 image=quay.io/ansible/centos7-test-container:3.1.0 python=2.7 seccomp=unconfined
fedora34 image=quay.io/ansible/fedora34-test-container:3.1.0 python=3.9 seccomp=unconfined
fedora35 image=quay.io/ansible/fedora35-test-container:3.2.0 python=3.10 seccomp=unconfined
opensuse15py2 image=quay.io/ansible/opensuse15py2-test-container:3.1.0 python=2.7
opensuse15 image=quay.io/ansible/opensuse15-test-container:3.1.0 python=3.6
ubuntu1804 image=quay.io/ansible/ubuntu1804-test-container:3.1.0 python=3.6 seccomp=unconfined
ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:3.1.0 python=3.8 seccomp=unconfined

@ -1,5 +1,5 @@
freebsd/12.3 python=3.8 python_dir=/usr/local/bin provider=aws
freebsd/13.0 python=3.7,2.7,3.8,3.9 python_dir=/usr/local/bin provider=aws
freebsd/13.0 python=3.7,3.8,3.9 python_dir=/usr/local/bin provider=aws
freebsd python_dir=/usr/local/bin provider=aws
macos/12.0 python=3.10 python_dir=/usr/local/bin provider=parallels
macos python_dir=/usr/local/bin provider=parallels

@ -82,17 +82,8 @@ pip_install() {
bootstrap_remote_freebsd()
{
if [ "${python_version}" = "2.7" ]; then
# on Python 2.7 our only option is to use virtualenv
virtualenv_pkg="py27-virtualenv"
else
# on Python 3.x we'll use the built-in venv instead
virtualenv_pkg=""
fi
packages="
python${python_package_version}
${virtualenv_pkg}
bash
curl
gtar
@ -177,13 +168,6 @@ bootstrap_remote_rhel_7()
python-virtualenv
"
if [ "${controller}" ]; then
packages="
${packages}
python2-cryptography
"
fi
while true; do
# shellcheck disable=SC2086
yum install -q -y ${packages} \

Loading…
Cancel
Save