From 1f0e2db2a964b403b8f5656edc25b4e5f0b6e87c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 10:58:34 -0700 Subject: [PATCH] Reapply "CI: test nftables driver on fedora" Temporary, until we get CI VMs with kernel 6.11.6. I've lost track of where this is being discussed. This reverts commit 7f836df303b92a606c17a336911bba206e9fea68. Signed-off-by: Ed Santiago (cherry picked from commit 0e66a793bc416f76be15a603d1b2d8bd336f3865) Signed-off-by: Paul Holzinger --- contrib/cirrus/setup_environment.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 2314f575b0..ac4fa749a3 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -147,6 +147,11 @@ case "$OS_RELEASE_ID" in msg "Enabling container_manage_cgroup" showrun setsebool container_manage_cgroup true fi + + # Test nftables driver, https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault + # We can drop this once this implemented and pushed into fedora stable. We cannot test it on + # debian because the netavark version there is way to old for nftables support. + printf "[network]\nfirewall_driver=\"nftables\"\n" > /etc/containers/containers.conf.d/90-nftables.conf ;; *) die_unknown OS_RELEASE_ID esac