summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <mclay@redhat.com>2021-04-12 18:57:29 -0700
committerGitHub <noreply@github.com>2021-04-12 20:57:29 -0500
commitcf18aa3d7455301ad2e2cf3363dbbfb42b07a956 (patch)
tree666bbb1b9a67a403f0b9cc65fc3d68ccd7c84c0b
parentad2221fbc8a0842d92f0605bad808d118e73aad5 (diff)
downloadansible-cf18aa3d7455301ad2e2cf3363dbbfb42b07a956.tar.gz
[stable-2.11] Update test containers in ansible-test. (#74166) (#74167)
* Update distro test containers to version 2.0.2. * Update the default test containers. (cherry picked from commit 459ea5a4a48b770f09be9b8f48f2593594f348f2) Co-authored-by: Matt Clay <mclay@redhat.com>
-rw-r--r--changelogs/fragments/ansible-test-default-containers-3.2.yml2
-rw-r--r--changelogs/fragments/ansible-test-distro-containers-2.0.2.yml2
-rw-r--r--test/lib/ansible_test/_data/completion/docker.txt24
3 files changed, 16 insertions, 12 deletions
diff --git a/changelogs/fragments/ansible-test-default-containers-3.2.yml b/changelogs/fragments/ansible-test-default-containers-3.2.yml
new file mode 100644
index 0000000000..ea4d627c94
--- /dev/null
+++ b/changelogs/fragments/ansible-test-default-containers-3.2.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - ansible-test - Update the Ansible Core and Ansible Collection default test containers to 3.2.0 and 3.2.2 respectively.
diff --git a/changelogs/fragments/ansible-test-distro-containers-2.0.2.yml b/changelogs/fragments/ansible-test-distro-containers-2.0.2.yml
new file mode 100644
index 0000000000..225d7fbac0
--- /dev/null
+++ b/changelogs/fragments/ansible-test-distro-containers-2.0.2.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - ansible-test - Update distribution test containers from version 2.0.1 to 2.0.2.
diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
index cbc58ec04e..2fba1a5dc3 100644
--- a/test/lib/ansible_test/_data/completion/docker.txt
+++ b/test/lib/ansible_test/_data/completion/docker.txt
@@ -1,12 +1,12 @@
-default name=quay.io/ansible/default-test-container:3.1.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=collection
-default name=quay.io/ansible/ansible-core-test-container:3.1.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=ansible-core
-alpine3 name=quay.io/ansible/alpine3-test-container:2.0.1 python=3.8
-centos6 name=quay.io/ansible/centos6-test-container:2.0.1 python=2.6 seccomp=unconfined
-centos7 name=quay.io/ansible/centos7-test-container:2.0.1 python=2.7 seccomp=unconfined
-centos8 name=quay.io/ansible/centos8-test-container:2.0.1 python=3.6 seccomp=unconfined
-fedora32 name=quay.io/ansible/fedora32-test-container:2.0.1 python=3.8
-fedora33 name=quay.io/ansible/fedora33-test-container:2.0.1 python=3.9
-opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:2.0.1 python=2.7
-opensuse15 name=quay.io/ansible/opensuse15-test-container:2.0.1 python=3.6
-ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:2.0.1 python=3.6 seccomp=unconfined
-ubuntu2004 name=quay.io/ansible/ubuntu2004-test-container:2.0.1 python=3.8 seccomp=unconfined
+default name=quay.io/ansible/default-test-container:3.2.2 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=collection
+default name=quay.io/ansible/ansible-core-test-container:3.2.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 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
+centos8 name=quay.io/ansible/centos8-test-container:2.0.2 python=3.6 seccomp=unconfined
+fedora32 name=quay.io/ansible/fedora32-test-container:2.0.2 python=3.8
+fedora33 name=quay.io/ansible/fedora33-test-container:2.0.2 python=3.9
+opensuse15py2 name=quay.io/ansible/opensuse15py2-test-container:2.0.2 python=2.7
+opensuse15 name=quay.io/ansible/opensuse15-test-container:2.0.2 python=3.6
+ubuntu1804 name=quay.io/ansible/ubuntu1804-test-container:2.0.2 python=3.6 seccomp=unconfined
+ubuntu2004 name=quay.io/ansible/ubuntu2004-test-container:2.0.2 python=3.8 seccomp=unconfined