ansible-test - Update distro containers. (#77847)

* ansible-test - Add a Ubuntu 22.04 container.
* ansible-test - Add a Fedora 36 container.
* ansible-test - Update distro containers.
* Fix dnf test on Fedora 36.
* Work around scp test issues.
pull/77852/head
Matt Clay 2 years ago committed by GitHub
parent ef3ea4cdc3
commit 3d2c2e60aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -116,16 +116,16 @@ stages:
test: alpine3 test: alpine3
- name: CentOS 7 - name: CentOS 7
test: centos7 test: centos7
- name: Fedora 34
test: fedora34
- name: Fedora 35 - name: Fedora 35
test: fedora35 test: fedora35
- name: Fedora 36
test: fedora36
- name: openSUSE 15 - name: openSUSE 15
test: opensuse15 test: opensuse15
- name: Ubuntu 18.04
test: ubuntu1804
- name: Ubuntu 20.04 - name: Ubuntu 20.04
test: ubuntu2004 test: ubuntu2004
- name: Ubuntu 22.04
test: ubuntu2204
groups: groups:
- 1 - 1
- 2 - 2

@ -0,0 +1,3 @@
minor_changes:
- ansible-test - Ubuntu 22.04 has been added as a test container.
- ansible-test - Fedora 36 has been added as a test container.

@ -38,10 +38,7 @@
- "not apt_multi_secondary.changed" - "not apt_multi_secondary.changed"
- name: remove all {{ apt_foreign_arch }} packages - name: remove all {{ apt_foreign_arch }} packages
apt: shell: "apt-get remove -y --allow-remove-essential '*:{{ apt_foreign_arch }}'"
name: "*:{{ apt_foreign_arch }}"
state: absent
purge: yes
- name: remove {{ apt_foreign_arch }} architecture - name: remove {{ apt_foreign_arch }} architecture
command: dpkg --remove-architecture {{ apt_foreign_arch }} command: dpkg --remove-architecture {{ apt_foreign_arch }}

@ -0,0 +1 @@
multiarch_test_pkg: libunistring2

@ -46,14 +46,18 @@ fi
set -e set -e
# temporary work-around for issues due to new scp filename checking if [[ "$(scp -O 2>&1)" == "usage: scp "* ]]; then
# https://github.com/ansible/ansible/issues/52640 # scp supports the -O option (and thus the -T option as well)
if [[ "$(scp -T 2>&1)" == "usage: scp "* ]]; then # work-around required
# see: https://www.openssh.com/txt/release-9.0
scp_args=("-e" "ansible_scp_extra_args=-TO")
elif [[ "$(scp -T 2>&1)" == "usage: scp "* ]]; then
# scp supports the -T option # scp supports the -T option
# work-around required # work-around required
# see: https://github.com/ansible/ansible/issues/52640
scp_args=("-e" "ansible_scp_extra_args=-T") scp_args=("-e" "ansible_scp_extra_args=-T")
else else
# scp does not support the -T option # scp does not support the -T or -O options
# no work-around required # no work-around required
# however we need to put something in the array to keep older versions of bash happy # however we need to put something in the array to keep older versions of bash happy
scp_args=("-e" "") scp_args=("-e" "")

@ -1,2 +0,0 @@
astream_name: '@httpd:2.4/common'
astream_name_no_stream: '@httpd/common'

@ -1,2 +0,0 @@
astream_name: '@httpd:2.4/common'
astream_name_no_stream: '@httpd/common'

@ -1,2 +0,0 @@
astream_name: '@varnish:6.0/default'
astream_name_no_stream: '@varnish/default'

@ -1,6 +1,6 @@
astream_name: '@hub:pre-release/default' astream_name: '@varnish:6.0/default'
# For this to work, it needs to be that only shows once in `dnf module list`. # For this to work, it needs to be that only shows once in `dnf module list`.
# Such packages, that exist on all the versions we test on, are hard to come by. # Such packages, that exist on all the versions we test on, are hard to come by.
# TODO: This would be solved by using our own repo with modularity/streams. # TODO: This would be solved by using our own repo with modularity/streams.
astream_name_no_stream: '@hub/default' astream_name_no_stream: '@varnish/default'

@ -1,10 +1,12 @@
base image=quay.io/ansible/base-test-container:3.1.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined base image=quay.io/ansible/base-test-container:3.1.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined
default image=quay.io/ansible/default-test-container:6.3.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=collection default image=quay.io/ansible/default-test-container:6.3.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=collection
default image=quay.io/ansible/ansible-core-test-container:6.3.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=ansible-core default image=quay.io/ansible/ansible-core-test-container:6.3.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=ansible-core
alpine3 image=quay.io/ansible/alpine3-test-container:4.0.0 python=3.9 alpine3 image=quay.io/ansible/alpine3-test-container:4.1.0 python=3.9
centos7 image=quay.io/ansible/centos7-test-container:4.0.0 python=2.7 seccomp=unconfined centos7 image=quay.io/ansible/centos7-test-container:4.1.0 python=2.7 seccomp=unconfined
fedora34 image=quay.io/ansible/fedora34-test-container:4.0.0 python=3.9 seccomp=unconfined fedora34 image=quay.io/ansible/fedora34-test-container:4.0.0 python=3.9 seccomp=unconfined
fedora35 image=quay.io/ansible/fedora35-test-container:4.0.0 python=3.10 seccomp=unconfined fedora35 image=quay.io/ansible/fedora35-test-container:4.1.0 python=3.10 seccomp=unconfined
opensuse15 image=quay.io/ansible/opensuse15-test-container:4.0.0 python=3.6 fedora36 image=quay.io/ansible/fedora36-test-container:4.1.0 python=3.10 seccomp=unconfined
opensuse15 image=quay.io/ansible/opensuse15-test-container:4.1.0 python=3.6
ubuntu1804 image=quay.io/ansible/ubuntu1804-test-container:3.1.0 python=3.6 seccomp=unconfined ubuntu1804 image=quay.io/ansible/ubuntu1804-test-container:3.1.0 python=3.6 seccomp=unconfined
ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:4.0.0 python=3.8 seccomp=unconfined ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:4.1.0 python=3.8 seccomp=unconfined
ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:4.1.0 python=3.10 seccomp=unconfined

Loading…
Cancel
Save