Merge pull request opencontainers#4505 from kolyshkin/fedora41

CI: bump Fedora 40 -> 41

0001-test.patch

@@ -0,0 +1,45 @@
+From 531ea1cb4e35d5af73e04255c507e55aa328d2cc Mon Sep 17 00:00:00 2001
+From: AntonMoryakov <[email protected]>
+Date: Wed, 6 Nov 2024 14:09:19 +0300
+Subject: [PATCH] test
+
+---
+ checkpoint.go | 4 +---
+ main.go       | 1 +
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/checkpoint.go b/checkpoint.go
+index c1bcc703..b5576c81 100644
+--- a/checkpoint.go
++++ b/checkpoint.go
+@@ -8,14 +8,12 @@ import (
+ 	"path/filepath"
+ 	"strconv"
+
+-	criu "github.com/checkpoint-restore/go-criu/v6/rpc"
+ 	"github.com/moby/sys/userns"
++	"github.com/opencontainers/runc/libcontainer"
+ 	"github.com/opencontainers/runtime-spec/specs-go"
+ 	"github.com/sirupsen/logrus"
+ 	"github.com/urfave/cli"
+ 	"golang.org/x/sys/unix"
+-
+-	"github.com/opencontainers/runc/libcontainer"
+ )
+
+ var checkpointCommand = cli.Command{
+diff --git a/main.go b/main.go
+index cac34ce0..faf5a1d9 100644
+--- a/main.go
++++ b/main.go
+@@ -55,6 +55,7 @@ value for "bundle" is the current directory.`
+ )
+
+ func main() {
++	//edit test1
+ 	app := cli.NewApp()
+ 	app.Name = "runc"
+ 	app.Usage = usage
+-- 
+2.34.1
+

Vagrantfile.fedora

@@ -2,9 +2,9 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "fedora-40"
+  config.vm.box = "fedora-41"
   # For URL, check https://www.fedoraproject.org/cloud/download
-  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt.x86_64-40-1.14.vagrant.libvirt.box"
+  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-41-1.4.x86_64.vagrant.libvirt.box"
   config.vm.provider :virtualbox do |v|
     v.memory = 2048
     v.cpus = 2
@@ -15,18 +15,12 @@ Vagrant.configure("2") do |config|
   end
   config.vm.provision "shell", inline: <<-SHELL
     set -e -u -o pipefail
-    # Work around dnf mirror failures by retrying a few times
+    DNF_OPTS="-y --setopt=install_weak_deps=False --setopt=tsflags=nodocs --exclude=kernel,kernel-core"
+    RPMS="bats git-core glibc-static golang jq libseccomp-devel make"
+    # Work around dnf mirror failures by retrying a few times.
     for i in $(seq 0 2); do
       sleep $i
-      # "config exclude" dnf shell command is not working in Fedora 35
-      # (see https://bugzilla.redhat.com/show_bug.cgi?id=2022571);
-      # the workaround is to specify it as an option.
-      cat << EOF | dnf -y --exclude=kernel,kernel-core shell && break
-config install_weak_deps false
-update
-install iptables gcc golang-go make glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs container-selinux
-ts run
-EOF
+      dnf $DNF_OPTS update && dnf $DNF_OPTS install $RPMS && break
     done
     dnf clean all