2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 01:51:51 +00:00

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 <areber@redhat.com>
This commit is contained in:
Adrian Reber 2025-02-05 07:51:38 +00:00 committed by Andrei Vagin
parent 6d8898c4e7
commit 5d87fac0e0
7 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,6 @@
{
'flavor': 'h',
'feature': 'has_ipt_legacy',
'flags': 'suid excl reqrst',
'dopts': '--tcp-established --network-lock iptables',
'ropts': '--tcp-established',

View File

@ -1,5 +1,6 @@
{
'flavor': 'h',
'feature': 'has_ipt_legacy',
'flags': 'suid excl reqrst',
'dopts': '--tcp-established --network-lock iptables',
'ropts': '--tcp-established',

View File

@ -3,4 +3,5 @@
'/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',
'/usr/bin/diff'],
'flags': 'suid',
'feature': 'has_ipt_legacy',
'flavor': 'ns uns'}

View File

@ -1,6 +1,7 @@
{
'flavor': 'h',
'flags': 'suid excl reqrst',
'feature': 'has_ipt_legacy',
'opts': '--tcp-established',
'dopts': '--network-lock iptables',
'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'

View File

@ -5,6 +5,6 @@
],
'opts': '--tcp-established',
'flags': 'suid nouser samens',
'feature' : 'tcp_half_closed',
'feature' : 'tcp_half_closed has_ipt_legacy',
'flavor': 'ns uns',
}

View File

@ -6,5 +6,5 @@
],
'opts': '--tcp-established',
'flags': 'suid nouser samens',
'feature' : 'tcp_half_closed'
'feature' : 'tcp_half_closed has_ipt_legacy'
}

View File

@ -5,5 +5,5 @@
],
'opts': '--tcp-established',
'flags': 'suid nouser samens',
'feature' : 'tcp_half_closed'
'feature' : 'tcp_half_closed has_ipt_legacy'
}