summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-12-02 16:01:41 -0600
committerGitHub <noreply@github.com>2020-12-02 14:01:41 -0800
commitd92820c2d53a6a070419244b4614d7c068f66161 (patch)
treefd528283b14ca6fc436ab7809f020927acfdd3a9
parent0515895aa7619e28c1a88d3ef83a92cf792c8a0d (diff)
downloadansible-d92820c2d53a6a070419244b4614d7c068f66161.tar.gz
[centos6] update container for EOL (#72797)
* [centos6] update container for EOL Change: - Reference: https://lists.centos.org/pipermail/centos-devel/2020-December/056208.html - Bump centos6 container to 1.25.0 Test Plan: - ci_complete Signed-off-by: Rick Elrod <rick@elrod.me> * update EPEL 6 too which is now archived Signed-off-by: Rick Elrod <rick@elrod.me> * bump to 1.26.0 Signed-off-by: Rick Elrod <rick@elrod.me>
-rw-r--r--changelogs/fragments/ansible-test-centos6-eol.yml2
-rw-r--r--test/integration/targets/yum_repository/vars/CentOS.yml2
-rw-r--r--test/lib/ansible_test/_data/completion/docker.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/changelogs/fragments/ansible-test-centos6-eol.yml b/changelogs/fragments/ansible-test-centos6-eol.yml
new file mode 100644
index 0000000000..3bc751035d
--- /dev/null
+++ b/changelogs/fragments/ansible-test-centos6-eol.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - ansible-test - centos6 end of life - container image updated to point to vault base repository (https://github.com/ansible/distro-test-containers/pull/54)
diff --git a/test/integration/targets/yum_repository/vars/CentOS.yml b/test/integration/targets/yum_repository/vars/CentOS.yml
index 542b722f7a..db9947d5ea 100644
--- a/test/integration/targets/yum_repository/vars/CentOS.yml
+++ b/test/integration/targets/yum_repository/vars/CentOS.yml
@@ -2,7 +2,7 @@ yum_repository_test_package: sl
yum_repository_test_repo:
name: epel
description: EPEL yum repo
- baseurl: http://download.fedoraproject.org/pub/epel/{{ ansible_facts.distribution_major_version }}/$basearch
+ baseurl: https://archives.fedoraproject.org/pub/archive/epel/{{ ansible_facts.distribution_major_version }}/$basearch
yum_repository_epel:
description: Extra Packages for Enterprise Linux {{ ansible_facts.distribution_major_version }} - $basearch
diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
index 78653dad44..d47d51a4f9 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:1.10.1 python=3.6,2.6,2.7,3.5,3.7,3.8 seccomp=unconfined
-centos6 name=quay.io/ansible/centos6-test-container:1.8.0 python=2.6 seccomp=unconfined
+centos6 name=quay.io/ansible/centos6-test-container:1.26.0 python=2.6 seccomp=unconfined
centos7 name=quay.io/ansible/centos7-test-container:1.8.0 python=2.7 seccomp=unconfined
centos8 name=quay.io/ansible/centos8-test-container:1.10.0 python=3.6 seccomp=unconfined
fedora30 name=quay.io/ansible/fedora30-test-container:1.9.2 python=3.7