From ecc5a53288993247a808b4190e426ae3ae0b994d Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Sun, 25 Apr 2021 21:25:32 -0700 Subject: [PATCH] Update default containers to 3.4.0. (#74415) * Update default containers to 3.4.0. The 3.4.0 containers use Python 3.6 (the system Python) for `/usr/bin/python3`. Python 3.9 continues to be the default Python version selected by `ansible-test` for these containers. * Fix shebang on build-ansible.py. Using `python` instead of `python3` allows `ansible-test` python interception and requirements install to function. --- changelogs/fragments/ansible-test-default-container.yml | 2 +- hacking/build-ansible.py | 2 +- test/lib/ansible_test/_data/completion/docker.txt | 4 ++-- test/sanity/ignore.txt | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changelogs/fragments/ansible-test-default-container.yml b/changelogs/fragments/ansible-test-default-container.yml index b4a4ebd725d..b3d5bcf15e2 100644 --- a/changelogs/fragments/ansible-test-default-container.yml +++ b/changelogs/fragments/ansible-test-default-container.yml @@ -1,2 +1,2 @@ minor_changes: - - ansible-test - The ``default`` test container has been updated to version 3.3.0 and now uses Python 3.9 by default instead of Python 3.6. + - ansible-test - The ``default`` test container has been updated to version 3.4.0 and now uses Python 3.9 by default instead of Python 3.6. diff --git a/hacking/build-ansible.py b/hacking/build-ansible.py index 8ebb88d33bd..c108c1861fa 100755 --- a/hacking/build-ansible.py +++ b/hacking/build-ansible.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # coding: utf-8 # PYTHON_ARGCOMPLETE_OK # Copyright: (c) 2019, Ansible Project diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt index 12951a084c4..50cd3983060 100644 --- a/test/lib/ansible_test/_data/completion/docker.txt +++ b/test/lib/ansible_test/_data/completion/docker.txt @@ -1,5 +1,5 @@ -default name=quay.io/ansible/default-test-container:3.3.0 python=3.9,2.6,2.7,3.5,3.6,3.7,3.8 seccomp=unconfined context=collection -default name=quay.io/ansible/ansible-core-test-container:3.3.0 python=3.9,2.6,2.7,3.5,3.6,3.7,3.8 seccomp=unconfined context=ansible-core +default name=quay.io/ansible/default-test-container:3.4.0 python=3.9,2.6,2.7,3.5,3.6,3.7,3.8 seccomp=unconfined context=collection +default name=quay.io/ansible/ansible-core-test-container:3.4.0 python=3.9,2.6,2.7,3.5,3.6,3.7,3.8 seccomp=unconfined context=ansible-core alpine3 name=quay.io/ansible/alpine3-test-container:2.0.2 python=3.8 centos6 name=quay.io/ansible/centos6-test-container:2.0.2 python=2.6 seccomp=unconfined centos7 name=quay.io/ansible/centos7-test-container:2.0.2 python=2.7 seccomp=unconfined diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 3f25b212852..01d520b308c 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -6,7 +6,6 @@ examples/scripts/my_test_facts.py shebang # example module but not in a normal m examples/scripts/my_test_info.py shebang # example module but not in a normal module location examples/scripts/upgrade_to_ps3.ps1 pslint:PSCustomUseLiteralPath examples/scripts/upgrade_to_ps3.ps1 pslint:PSUseApprovedVerbs -hacking/build-ansible.py shebang # only run by release engineers, Python 3.6+ required hacking/build_library/build_ansible/announce.py compile-2.6!skip # release process only, 3.6+ required hacking/build_library/build_ansible/announce.py compile-2.7!skip # release process only, 3.6+ required hacking/build_library/build_ansible/announce.py compile-3.5!skip # release process only, 3.6+ required