From 0d7ab375ebb8f180dbf639297c8f235ae4ccfa49 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Wed, 2 Dec 2020 16:04:38 -0600 Subject: [PATCH] [centos6] update container for EOL (#72795) 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 --- changelogs/fragments/ansible-test-centos6-eol.yml | 2 ++ test/integration/targets/yum_repository/vars/CentOS.yml | 2 +- test/lib/ansible_test/_data/completion/docker.txt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ansible-test-centos6-eol.yml diff --git a/changelogs/fragments/ansible-test-centos6-eol.yml b/changelogs/fragments/ansible-test-centos6-eol.yml new file mode 100644 index 00000000000..3bc751035d3 --- /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 542b722f7a2..db9947d5ea3 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 68cdf398407..978ba703ccb 100644 --- a/test/lib/ansible_test/_data/completion/docker.txt +++ b/test/lib/ansible_test/_data/completion/docker.txt @@ -1,6 +1,6 @@ default name=quay.io/ansible/default-test-container:2.9.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-base-test-container:1.7.0 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined context=ansible-base -centos6 name=quay.io/ansible/centos6-test-container:1.17.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.17.0 python=2.7 seccomp=unconfined centos8 name=quay.io/ansible/centos8-test-container:1.21.0 python=3.6 seccomp=unconfined fedora30 name=quay.io/ansible/fedora30-test-container:1.17.0 python=3.7