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

Update default containers to 3.4.0. (#74415)

Browse source 
* 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.
This commit is contained in:
Matt Clay 2021-04-25 21:25:32 -07:00 committed by GitHub
parent 7ca5dede97
commit ecc5a53288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ansible-test-default-container.yml
View file

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

2
hacking/build-ansible.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/bin/env python
# coding: utf-8
# PYTHON_ARGCOMPLETE_OK
# Copyright: (c) 2019, Ansible Project

4
test/lib/ansible_test/_data/completion/docker.txt
View file

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

1
test/sanity/ignore.txt
View file

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