From 856bdd3c74fe7e53d52a0189f8b2530f2dff7fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 18 Mar 2025 10:59:47 +0100 Subject: [PATCH] test/cross-distro: remove unnecessary condition for composer < v97 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This test case is no longer being run with an osbuild-composer version lower than v97, so there's no need to special case it. Signed-off-by: Tomáš Hozza --- test/cases/cross-distro.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/cases/cross-distro.sh b/test/cases/cross-distro.sh index 4fb0ec488..11d2048e4 100755 --- a/test/cases/cross-distro.sh +++ b/test/cases/cross-distro.sh @@ -173,11 +173,7 @@ EOF # there is a different reponse if legacy composer-cli is used if rpm -q --quiet weldr-client; then - if nvrGreaterOrEqual "osbuild-composer" "97"; then - EXPECTED_RESPONSE="ERROR: BlueprintsError: '$REMAINING_DISTRO' is not a valid distribution (architecture '$(uname -m)')" - else - EXPECTED_RESPONSE="ERROR: BlueprintsError: '$REMAINING_DISTRO' is not a valid distribution" - fi + EXPECTED_RESPONSE="ERROR: BlueprintsError: '$REMAINING_DISTRO' is not a valid distribution (architecture '$(uname -m)')" else EXPECTED_RESPONSE="'$REMAINING_DISTRO' is not a valid distribution" RESPONSE=${RESPONSE#*: }