From 609e9a51345288e2acc6cfd03ca95da9a72c804e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 1 Nov 2024 16:44:02 -0700 Subject: [PATCH 1/2] Vagrantfile.fedora: stop using dnf shell In Fedora 41, dnf5 is used and it does not have dnf shell. Let's use old dnf update; dnf install instead. It is two transactions instead of one, but dnf5 is faster. While at it: - add `--setopt=tsflags=nodocs` as we don't need docs in CI; - change golang-go to golang as this is a new rpm name; - remove gcc as it is now required by golang-bin; - remove container-selinux, criu, fuse-sshfs, iptables from rpms as they are already installed. Signed-off-by: Kir Kolyshkin --- Vagrantfile.fedora | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora index 4863808ee51..1d77c95136a 100644 --- a/Vagrantfile.fedora +++ b/Vagrantfile.fedora @@ -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 From 9ce7392b59448f8eb9021cdf04b5c462638b167e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 2 Nov 2024 07:38:16 +0900 Subject: [PATCH 2/2] Vagrantfile.fedora: bump Fedora to 41 Signed-off-by: Akihiro Suda --- Vagrantfile.fedora | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora index 1d77c95136a..f0099721521 100644 --- a/Vagrantfile.fedora +++ b/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