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

Merge pull request #8427 from AkihiroSuda/fedora38

Browse Source 
CI: update Fedora to 38
This commit is contained in:
Phil Estes 2023-08-07 15:41:49 -04:00 committed by GitHub
commit 649f356656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
box: box:
- fedora/37-cloud-base - fedora/38-cloud-base
# v7.0.0 does not boot. v6.0.0 was not released. # v7.0.0 does not boot. v6.0.0 was not released.
- rockylinux/8@5.0.0 - rockylinux/8@5.0.0
env: env:
@ -551,9 +551,17 @@ jobs:
key: vagrant-${{ matrix.box }} key: vagrant-${{ matrix.box }}
- name: Set up vagrant - name: Set up vagrant
run: | run: |
# Canonical's Vagrant 2.2.19 dpkg cannot download Fedora 38 image: https://bugs.launchpad.net/vagrant/+bug/2017828
# So we have to install Vagrant >= 2.3.1 from the upstream: https://github.com/opencontainers/runc/blob/v1.1.8/.cirrus.yml#L41-L49
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
sudo sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
sudo apt-get update sudo apt-get update
sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant vagrant-libvirt sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant
sudo systemctl enable --now libvirtd sudo systemctl enable --now libvirtd
sudo apt-get build-dep -y vagrant ruby-libvirt
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 - name: Boot VM
run: sudo BOX=$BOX vagrant up --no-tty run: sudo BOX=$BOX vagrant up --no-tty
- name: test-integration - name: test-integration

2
Vagrantfile vendored
View File

@ -17,7 +17,7 @@
# Vagrantfile for Fedora and EL # Vagrantfile for Fedora and EL
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/37-cloud-base" config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/38-cloud-base"
# BOX_VERSION is deprecated. Use "BOX=<BOX>@<BOX_VERSION>". # BOX_VERSION is deprecated. Use "BOX=<BOX>@<BOX_VERSION>".
config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"]) config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"])