From 27bd4c448c34fb89eb03819dd3bcc16b37dab543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Wed, 31 Jul 2024 21:25:34 +0200 Subject: [PATCH] Install external package builders on demand If they are not in already enabled repositories, test dependency would not be enough. --- Sanity/named/bind-dyndb-ldap-rebuild/main.fmf | 2 -- Sanity/named/bind-dyndb-ldap-rebuild/test.sh | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sanity/named/bind-dyndb-ldap-rebuild/main.fmf b/Sanity/named/bind-dyndb-ldap-rebuild/main.fmf index 489854f..582bb41 100644 --- a/Sanity/named/bind-dyndb-ldap-rebuild/main.fmf +++ b/Sanity/named/bind-dyndb-ldap-rebuild/main.fmf @@ -5,5 +5,3 @@ require: - bind-devel recommend: - fedpkg - - centpkg - - rhpkg diff --git a/Sanity/named/bind-dyndb-ldap-rebuild/test.sh b/Sanity/named/bind-dyndb-ldap-rebuild/test.sh index 401d1a0..e727105 100755 --- a/Sanity/named/bind-dyndb-ldap-rebuild/test.sh +++ b/Sanity/named/bind-dyndb-ldap-rebuild/test.sh @@ -8,21 +8,24 @@ rlJournalStart rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" rlRun "pushd $tmp" rlRun "source /etc/os-release" - case "$ID" + case "$ID" in centos) PKG=centpkg BRANCH=cs${VERSION} + rlRun "rpm -q $PKG || dnf install -y --enablerepo=epel $PKG" ;; rhel) PKG=rhpkg BRANCH=rhel-${VERSION}-main + rlRun "rpm -q $PKG || dnf install -y --enablerepo='*CRB' --enablerepo='*buildroot' $PKG" ;; fedora) PKG=fedpkg BRANCH=rawhide + rlRun "rpm -q $PKG || dnf install -y $PKG" ;; *) - rlFatal "Unsupported distribution $ID" ;; + rlLogFatal "Unsupported distribution $ID" ;; esac rlRun "$PKG clone -a bind-dyndb-ldap" rlRun "pushd bind-dyndb-ldap" @@ -31,7 +34,7 @@ rlJournalStart rlPhaseStartTest rlRun "git checkout $BRANCH" rlRun "$PKG local" - rlRun "rpm -qpl $(arch)/bind-dyndb-ldap-*.$(arch).rpm" + rlRun "rpm -qpl $(arch)/bind-dyndb-ldap-*.$(arch).rpm | grep bind/ldap.so" rlPhaseEnd rlPhaseStartCleanup