diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d4f9b090..a8c0f398b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -534,16 +534,16 @@ jobs: fail-fast: false matrix: include: - - box: fedora/40-cloud-base + - box: fedora/41-cloud-base cgroup_driver: cgroupfs runc: runc - - box: fedora/40-cloud-base + - box: fedora/41-cloud-base cgroup_driver: systemd runc: runc - - box: fedora/40-cloud-base + - box: fedora/41-cloud-base cgroup_driver: cgroupfs runc: crun - - box: fedora/40-cloud-base + - box: fedora/41-cloud-base cgroup_driver: systemd runc: crun # We have to keep EL8 to test old glibc, cgroup, kernel, etc. @@ -595,7 +595,15 @@ jobs: sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev sudo vagrant plugin install vagrant-libvirt - name: Boot VM - run: sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --no-tty + run: | + sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --no-tty + if [ "$BOX" = "fedora/41-cloud-base" ]; then + # Install the kernel update for Fedora 41 to fix an error "Extension MARK revision 0 not supported, missing kernel module" + # https://bugzilla.redhat.com/show_bug.cgi?id=2321325 + sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --provision-with=upgrade-packages + sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant halt + sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up + fi - name: test-integration run: sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-integration - name: test-cri-integration diff --git a/Vagrantfile b/Vagrantfile index 4a4f119a1..4048aecca 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,7 +17,7 @@ # Vagrantfile for Fedora and EL Vagrant.configure("2") do |config| - config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/40-cloud-base" + config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/41-cloud-base" # BOX_VERSION is deprecated. Use "BOX=@". config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"])