mirror of
https://github.com/containerd/containerd.git
synced 2026-06-30 19:58:29 +00:00
Merge pull request #13525 from AkihiroSuda/fedora44
CI: update Fedora to 44
This commit is contained in:
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
@@ -579,16 +579,16 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- box: fedora/43-cloud-base
|
||||
- box: fedora/44-cloud-base
|
||||
cgroup_driver: cgroupfs
|
||||
runc: runc
|
||||
- box: fedora/43-cloud-base
|
||||
- box: fedora/44-cloud-base
|
||||
cgroup_driver: systemd
|
||||
runc: runc
|
||||
- box: fedora/43-cloud-base
|
||||
- box: fedora/44-cloud-base
|
||||
cgroup_driver: cgroupfs
|
||||
runc: crun
|
||||
- box: fedora/43-cloud-base
|
||||
- box: fedora/44-cloud-base
|
||||
cgroup_driver: systemd
|
||||
runc: crun
|
||||
# We have to keep EL8 to test old glibc, cgroup, kernel, etc.
|
||||
@@ -647,15 +647,15 @@ jobs:
|
||||
sudo env VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 vagrant plugin install vagrant-libvirt
|
||||
- name: Boot VM
|
||||
run: |
|
||||
if [ "$BOX" = "fedora/43-cloud-base" ]; then
|
||||
if [ "$BOX" = "fedora/44-cloud-base" ]; then
|
||||
# fedora/41-cloud-base seems the last version available in https://portal.cloud.hashicorp.com/vagrant/discover/fedora
|
||||
# Download the box file with curl (with retry) to handle flaky Fedora mirrors
|
||||
curl -fL --retry 5 --retry-delay 5 --retry-all-errors \
|
||||
--connect-timeout 30 --max-time 600 \
|
||||
-o /tmp/fedora43.box \
|
||||
https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-43-1.6.x86_64.vagrant.libvirt.box
|
||||
sudo vagrant box add fedora/43-cloud-base /tmp/fedora43.box
|
||||
rm -f /tmp/fedora43.box
|
||||
-o /tmp/fedora.box \
|
||||
https://download.fedoraproject.org/pub/fedora/linux/releases/44/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-44-1.7.x86_64.vagrant.libvirt.box
|
||||
sudo vagrant box add fedora/44-cloud-base /tmp/fedora.box
|
||||
rm -f /tmp/fedora.box
|
||||
fi
|
||||
sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --no-tty
|
||||
- name: test-integration
|
||||
|
||||
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@@ -17,7 +17,7 @@
|
||||
|
||||
# Vagrantfile for Fedora and EL
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/43-cloud-base"
|
||||
config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/44-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"])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user