particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust expected response based on osbuild-composer version

Browse source
This commit is contained in:
Alexander Todorov 2023-12-18 10:39:12 +02:00 • committed by Jakub Rusz
parent 7bcf8e5942
commit d6aff2f103
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/cases/cross-distro.sh
View file

@ -6,6 +6,7 @@
APISOCKET=/run/weldr/api.socket APISOCKET=/run/weldr/api.socket
source /etc/os-release source /etc/os-release
source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# Build a grep pattern that results in an empty string when the expected distros are installed # Build a grep pattern that results in an empty string when the expected distros are installed
case $ID in case $ID in
@ -146,7 +147,11 @@ EOF
# there is a different reponse if legacy composer-cli is used # there is a different reponse if legacy composer-cli is used
if rpm -q --quiet weldr-client; then if rpm -q --quiet weldr-client; then
EXPECTED_RESPONSE="ERROR: BlueprintsError: '$REMAINING_DISTRO' is not a valid distribution (architecture '$(uname -m)')" 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
else else
EXPECTED_RESPONSE="'$REMAINING_DISTRO' is not a valid distribution" EXPECTED_RESPONSE="'$REMAINING_DISTRO' is not a valid distribution"
RESPONSE=${RESPONSE#*: } RESPONSE=${RESPONSE#*: }