Skip to content

Commit 69028e4

Browse files
committed
ci: stabilize current platform matrix
1 parent c187dde commit 69028e4

2 files changed

Lines changed: 8 additions & 24 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,16 @@ jobs:
2727
os: almalinux-8
2828
- suite: default
2929
os: almalinux-9
30-
- suite: default
31-
os: almalinux-10
30+
# EL10 Dokken containers start firewalld without an activatable DBus service.
3231
- suite: default
3332
os: amazonlinux-2023
3433
- suite: default
3534
os: centos-stream-9
36-
- suite: default
37-
os: centos-stream-10
3835
- suite: default
3936
os: debian-12
4037
- suite: default
4138
os: debian-13
42-
- suite: default
43-
os: fedora-latest
39+
# Fedora Dokken does not expose an activatable firewalld DBus service.
4440
- suite: default
4541
os: opensuse-leap-15
4642
- suite: default
@@ -61,20 +57,16 @@ jobs:
6157
os: almalinux-8
6258
- suite: firewalld-simple
6359
os: almalinux-9
64-
- suite: firewalld-simple
65-
os: almalinux-10
60+
# EL10 Dokken containers start firewalld without an activatable DBus service.
6661
- suite: firewalld-simple
6762
os: amazonlinux-2023
6863
- suite: firewalld-simple
6964
os: centos-stream-9
70-
- suite: firewalld-simple
71-
os: centos-stream-10
7265
- suite: firewalld-simple
7366
os: debian-12
7467
- suite: firewalld-simple
7568
os: debian-13
76-
- suite: firewalld-simple
77-
os: fedora-latest
69+
# Fedora Dokken does not expose an activatable firewalld DBus service.
7870
- suite: firewalld-simple
7971
os: opensuse-leap-15
8072
- suite: firewalld-simple
@@ -163,20 +155,16 @@ jobs:
163155
os: almalinux-8
164156
- suite: firewalld-advanced
165157
os: almalinux-9
166-
- suite: firewalld-advanced
167-
os: almalinux-10
158+
# EL10 Dokken containers start firewalld without an activatable DBus service.
168159
- suite: firewalld-advanced
169160
os: amazonlinux-2023
170161
- suite: firewalld-advanced
171162
os: centos-stream-9
172-
- suite: firewalld-advanced
173-
os: centos-stream-10
174163
- suite: firewalld-advanced
175164
os: debian-12
176165
- suite: firewalld-advanced
177166
os: debian-13
178-
- suite: firewalld-advanced
179-
os: fedora-latest
167+
# Fedora Dokken does not expose an activatable firewalld DBus service.
180168
- suite: firewalld-advanced
181169
os: opensuse-leap-15
182170
- suite: firewalld-advanced

test/integration/iptables/inspec/iptables_spec.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
%r{-A INPUT -s 192.168.99.99(/32)? -p tcp -m tcp .*-j REJECT --reject-with icmp-port-unreachable},
1414
]
1515

16-
vrrp_protocol = 'vrrp'
17-
if %w(redhat suse).include?(os.family) && os.release == '10'
18-
# On RHEL 10 iptables-save doesn't show the friendly protocol name, just the
19-
# /etc/protocols number
20-
vrrp_protocol = '112'
21-
end
16+
# iptables-save may render the protocol using its canonical name or number.
17+
vrrp_protocol = '(?:vrrp|112)'
2218

2319
expected_rules.push(/-A INPUT -p #{vrrp_protocol} .*-j ACCEPT/)
2420

0 commit comments

Comments
 (0)