From feb216c07baeace975e5acece13d794d7fb61e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Mon, 24 Apr 2023 16:58:13 +0200 Subject: [PATCH] mockbuild.sh: use dnf to install local package, not rpm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DNF has more elaborate locking system and can wait for other instances of itself when installing packages. Using rpm directly to install local package is causing failures in CI due to it not being able to acquire lock on `/var/lib/rpm/.rpm.lock`. Using DNF should improve the situation, although there is no good documentation to link and support this claim for sure. Signed-off-by: Tomáš Hozza --- schutzbot/mockbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh index b6ef7439..7a3b3135 100755 --- a/schutzbot/mockbuild.sh +++ b/schutzbot/mockbuild.sh @@ -90,7 +90,7 @@ if [[ $ID == rhel || $ID == centos ]] && ! rpm -q epel-release; then greenprint "📦 Setting up EPEL repository" curl -Ls --retry 5 --output /tmp/epel.rpm \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID%.*}.noarch.rpm - sudo rpm -Uvh /tmp/epel.rpm + sudo dnf install -y /tmp/epel.rpm fi # Install requirements for building RPMs in mock.