Skip to content

Commit 1546d4f

Browse files
committed
ci: do not run tests requiring iptables if it is missing
There are a couple of tests that require the iptables binary. Instead of adding a checkskip script, which could also handle this, this change now uses CRIU's feature detection to see if the CRIU feature 'has_ipt_legacy' exists. Signed-off-by: Adrian Reber <[email protected]>
1 parent 88c5e5f commit 1546d4f

7 files changed

+7
-3
lines changed

test/zdtm/static/net_lock_socket_iptables.desc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
'flavor': 'h',
3+
'feature': 'has_ipt_legacy',
34
'flags': 'suid excl reqrst',
45
'dopts': '--tcp-established --network-lock iptables',
56
'ropts': '--tcp-established',

test/zdtm/static/net_lock_socket_iptables6.desc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
'flavor': 'h',
3+
'feature': 'has_ipt_legacy',
34
'flags': 'suid excl reqrst',
45
'dopts': '--tcp-established --network-lock iptables',
56
'ropts': '--tcp-established',

test/zdtm/static/netns-nf.desc

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
'/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
44
'/usr/bin/diff'],
55
'flags': 'suid',
6+
'feature': 'has_ipt_legacy',
67
'flavor': 'ns uns'}

test/zdtm/static/netns_lock_iptables.desc

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
'flavor': 'h',
33
'flags': 'suid excl reqrst',
4+
'feature': 'has_ipt_legacy',
45
'opts': '--tcp-established',
56
'dopts': '--network-lock iptables',
67
'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'

test/zdtm/static/socket-tcp-closed-last-ack.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
],
66
'opts': '--tcp-established',
77
'flags': 'suid nouser samens',
8-
'feature' : 'tcp_half_closed',
8+
'feature' : 'tcp_half_closed has_ipt_legacy',
99
'flavor': 'ns uns',
1010
}

test/zdtm/static/socket-tcp-reseted.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
],
77
'opts': '--tcp-established',
88
'flags': 'suid nouser samens',
9-
'feature' : 'tcp_half_closed'
9+
'feature' : 'tcp_half_closed has_ipt_legacy'
1010
}

test/zdtm/static/socket-tcp-syn-sent.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
],
66
'opts': '--tcp-established',
77
'flags': 'suid nouser samens',
8-
'feature' : 'tcp_half_closed'
8+
'feature' : 'tcp_half_closed has_ipt_legacy'
99
}

0 commit comments

Comments
 (0)