From 218a784778330a8aaa9828c7233e7654487625f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Mon, 19 Feb 2024 14:14:51 +0100 Subject: [PATCH] Test/base_tests.sh: workaround missing osbuild-depsolve-dnf in nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The RHEL nightly composes still contain old osbuild-composer version, which does not have an explicit dependency on osbuild-depsolve-dnf package. As a result, running the latest upstream base_tests.sh on RHEL nightly composes fails due to osbuild-depsolve-dnf not being installed. Workaround this in the test case by explicitly installing the osbuild-depsolve-dnf package in case the osbuild-composer version is lower than the one which has an explicit dependency on osbuild-depsolve-dnf. Signed-off-by: Tomáš Hozza --- test/cases/base_tests.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/cases/base_tests.sh b/test/cases/base_tests.sh index a2ebe230d7..fcdfdb66a4 100755 --- a/test/cases/base_tests.sh +++ b/test/cases/base_tests.sh @@ -51,6 +51,13 @@ run_test_case () { # Provision the software under test. /usr/libexec/osbuild-composer-test/provision.sh none +# Explicitly install osbuild-depsolve-dnf in nightly pipeline until the +# osbuild-composer version which has the dependency lands there (v101). +if ! nvrGreaterOrEqual "osbuild-composer" "101"; then + echo "osbuild-composer version is too old, explicitly installing osbuild-depsolve-dnf" + sudo dnf install -y osbuild-depsolve-dnf +fi + # Change to the working directory. cd $WORKING_DIRECTORY