From b028ecb352c562696faa1dd557acf96241b07fce Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 11 Nov 2021 17:50:41 -0800 Subject: [PATCH 1/2] Vagrantfile.fedora: exclude systemd from upgrade A bug in systemd-249.6-2.fc35.x86_64 prevents rootless containers from start when systemd manager is used. Apparently, "config exclude" is not working in F35 dnf shell either, so use a workaround of specifying --exclude from the command line. This should fix runc CI for the time being. Signed-off-by: Kir Kolyshkin --- Vagrantfile.fedora | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Vagrantfile.fedora b/Vagrantfile.fedora index 3a4496233..2c3df9abc 100644 --- a/Vagrantfile.fedora +++ b/Vagrantfile.fedora @@ -17,8 +17,14 @@ Vagrant.configure("2") do |config| # Work around dnf mirror failures by retrying a few times for i in $(seq 0 2); do sleep $i - cat << EOF | dnf -y shell && break -config exclude kernel,kernel-core + # 1. "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. + # 2. systemd 249.6-2.fc35 has a bug preventing rootless containers + # from starting when --systemd-cgroup is used for runc run + # (see https://bugzilla.redhat.com/show_bug.cgi?id=2022041), + # the workaround is not to upgrade systemd. + cat << EOF | dnf -y --exclude=kernel,kernel-core,systemd,systemd-* shell && break config install_weak_deps false update install iptables gcc make golang-go glibc-static libseccomp-devel bats jq git-core criu From 0880c001ab5826a3278f0110884bf49ad0db4ca0 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 11 Nov 2021 19:18:10 -0800 Subject: [PATCH 2/2] .cirrus.yml: silence vagrant up This skips printing endless "Progress 0%" messages. Signed-off-by: Kir Kolyshkin --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 39b8f39bb..bf9975a4f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -46,7 +46,7 @@ task: vagrant_up_script: | ln -sf Vagrantfile.$DISTRO Vagrantfile # Retry if it fails (download.fedoraproject.org returns 404 sometimes) - vagrant up || vagrant up + vagrant up --no-tty || vagrant up --no-tty mkdir -p -m 0700 /root/.ssh vagrant ssh-config >> /root/.ssh/config guest_info_script: |