From 5ef24fe1f502f3b29f592934ef3c26e84c2dbee1 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 1 Nov 2024 16:44:02 -0700 Subject: [PATCH] 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 man pages and READMEs in CI. 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..399d014c7ad 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 container-selinux criu fuse-sshfs gcc git-core glibc-static golang-go iptables 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