github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #11110 from k8s-infra-cherrypick-robot/cherry-pick-10930-to-release/2.0

Browse Source 
[release/2.0] CI: update Fedora to 41
This commit is contained in:
Akihiro Suda 2024-12-06 23:05:55 +09:00 committed by GitHub
commit ed0b75c52b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View File

@ -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

2
Vagrantfile vendored
View File

@ -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=<BOX>@<BOX_VERSION>".
config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"])