Skip to content

Commit 609e9a5

Browse files
committed
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 <[email protected]>
1 parent d6e6e7b commit 609e9a5

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

Vagrantfile.fedora

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,12 @@ Vagrant.configure("2") do |config|
1515
end
1616
config.vm.provision "shell", inline: <<-SHELL
1717
set -e -u -o pipefail
18-
# Work around dnf mirror failures by retrying a few times
18+
DNF_OPTS="-y --setopt=install_weak_deps=False --setopt=tsflags=nodocs --exclude=kernel,kernel-core"
19+
RPMS="bats git-core glibc-static golang jq libseccomp-devel make"
20+
# Work around dnf mirror failures by retrying a few times.
1921
for i in $(seq 0 2); do
2022
sleep $i
21-
# "config exclude" dnf shell command is not working in Fedora 35
22-
# (see https://bugzilla.redhat.com/show_bug.cgi?id=2022571);
23-
# the workaround is to specify it as an option.
24-
cat << EOF | dnf -y --exclude=kernel,kernel-core shell && break
25-
config install_weak_deps false
26-
update
27-
install iptables gcc golang-go make glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs container-selinux
28-
ts run
29-
EOF
23+
dnf $DNF_OPTS update && dnf $DNF_OPTS install $RPMS && break
3024
done
3125
dnf clean all
3226

0 commit comments

Comments
 (0)