This reverts commit e40f9312f8ad92682e16b189ca5553d309dc3651.
The above mentioned commit is no longer necessary as the active
ubuntu-24.04 GitHub Actions runner image [0] now contains kernel
package version 6.8.0-1017-azure which has the kernel commit
required ("openvswitch: get related ct labels from its master if
it is not confirmed") [1] for the test to pass.
0: https://github.com/actions/runner-images/releases/tag/ubuntu24%2F20241112.1
1:
https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-azure/+git/noble/commit/?h=Ubuntu-azure-6.8.0-1017.19
Signed-off-by: Frode Nordahl <[email protected]>
---
tests/system-traffic.at | 6 ------
1 file changed, 6 deletions(-)
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index 2b1686e99..db79549e8 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -7159,12 +7159,6 @@ dnl Checks the implementation of conntrack with FTP ALGs
in combination with
dnl NAT, using the provided flow table.
m4_define([CHECK_FTP_NAT],
[AT_SETUP([conntrack - FTP $1])
- m4_if(m4_index([$1], [orig tuple]), -1, [], [
- dnl XXX: 6.8.0-1014-azure #16~22.04.1-Ubuntu kernel in GitHub Actions
- dnl contains a known conntrack bug, but doesn't have a fix for it:
- dnl a23ac973f67f ("openvswitch: get related ct labels from its master
- dnl if it is not confirmed")
- OVS_CHECK_GITHUB_ACTION()])
AT_SKIP_IF([test $HAVE_FTP = no])
AT_SKIP_IF([test $HAVE_LFTP = no])
CHECK_CONNTRACK()
--
2.45.2
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
