From 7f836df303b92a606c17a336911bba206e9fea68 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 11 Oct 2024 13:11:11 +0200 Subject: [PATCH] Revert "CI: test nftables driver on fedora" This reverts commit 43f6173cc6050cd07348d8e0532a27ec0f24a774. The netavark version with nftables default is in f41 and rawhide already so this is no longer needed. While we do not yet test f41 in CI we have rawhide which is good enough until we update. Signed-off-by: Paul Holzinger --- contrib/cirrus/setup_environment.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ac4fa749a3..2314f575b0 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -147,11 +147,6 @@ 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