Skip to content

Commit d4acdb5

Browse files
committed
drop centos6 tests
CentOS 6 is EOL in a few days.
1 parent 5675b26 commit d4acdb5

File tree

3 files changed

+3
-40
lines changed

3 files changed

+3
-40
lines changed

images/centos_6/Dockerfile

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ def has_docker():
5757
DOCKER_IMAGES = [
5858
"alpine",
5959
"archlinux",
60-
"centos_6",
6160
"centos_7",
6261
"debian_buster",
6362
"ubuntu_xenial",
@@ -185,7 +184,6 @@ def host(request, tmpdir_factory):
185184
docker_id, connection='docker').service
186185

187186
images_with_sshd = (
188-
"centos_6",
189187
"centos_7",
190188
"alpine",
191189
"archlinux"

test/test_modules.py

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,11 @@
2626
all_images = pytest.mark.testinfra_hosts(*[
2727
"docker://{}".format(image)
2828
for image in (
29-
"alpine", "archlinux", "centos_6", "centos_7",
29+
"alpine", "archlinux", "centos_7",
3030
"debian_buster", "ubuntu_xenial"
3131
)
3232
])
3333

34-
centos_images = pytest.mark.testinfra_hosts(*[
35-
"docker://{}".format(image)
36-
for image in (
37-
"centos_6", "centos_7",
38-
)
39-
])
40-
4134

4235
@all_images
4336
def test_package(host, docker_image):
@@ -51,7 +44,6 @@ def test_package(host, docker_image):
5144
version = {
5245
"alpine": "8.",
5346
"archlinux": "8.",
54-
"centos_6": "5.",
5547
"centos_7": "7.",
5648
"debian_buster": "1:7.9",
5749
"ubuntu_xenial": "1:7.2"
@@ -61,7 +53,6 @@ def test_package(host, docker_image):
6153
release = {
6254
"alpine": "r0",
6355
"archlinux": None,
64-
"centos_6": ".el6",
6556
"centos_7": ".el7",
6657
"debian_buster": None,
6758
"ubuntu_xenial": None
@@ -79,8 +70,7 @@ def test_held_package(host):
7970
assert python.version.startswith("2.7.")
8071

8172

82-
@pytest.mark.destructive
83-
@centos_images
73+
@pytest.mark.testinfra_hosts("docker://centos_7")
8474
def test_non_default_package_tool(host):
8575
# Make non default pkg tool binary present
8676
host.run("install -m a+rx /bin/true /usr/bin/dpkg-query")
@@ -108,7 +98,6 @@ def test_systeminfo(host, docker_image):
10898
release, distribution, codename, arch = {
10999
"alpine": (r"^3\.11\.", "alpine", None, 'x86_64'),
110100
"archlinux": ("rolling", "arch", None, 'x86_64'),
111-
"centos_6": (r"^6", "CentOS", None, 'x86_64'),
112101
"centos_7": (r"^7$", "centos", None, 'x86_64'),
113102
"debian_buster": (r"^10", "debian", "buster", 'x86_64'),
114103
"ubuntu_xenial": (r"^16\.04$", "ubuntu", "xenial", 'x86_64')
@@ -121,7 +110,7 @@ def test_systeminfo(host, docker_image):
121110

122111
@all_images
123112
def test_ssh_service(host, docker_image):
124-
if docker_image in ("centos_6", "centos_7",
113+
if docker_image in ("centos_7",
125114
"alpine", "archlinux"):
126115
name = "sshd"
127116
else:
@@ -239,7 +228,6 @@ def test_process(host, docker_image):
239228
args, comm = {
240229
"alpine": ("/sbin/init", "init"),
241230
"archlinux": ("/usr/sbin/init", "systemd"),
242-
"centos_6": ("/usr/sbin/sshd -D", "sshd"),
243231
"centos_7": ("/usr/sbin/init", "systemd"),
244232
"debian_buster": ("/sbin/init", "systemd"),
245233
"ubuntu_xenial": ("/sbin/init", "systemd")
@@ -546,12 +534,6 @@ def test_iptables(host):
546534
assert host.iptables._has_w_argument is True
547535

548536

549-
@pytest.mark.testinfra_hosts('docker://centos_6')
550-
def test_iptables_centos6(host):
551-
host.iptables.rules()
552-
assert host.iptables._has_w_argument is False
553-
554-
555537
def test_ip6tables(host):
556538
# test ip6tables call works; ipv6 setup is a whole huge thing, but
557539
# ensure we at least see the headings

0 commit comments

Comments
 (0)