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

test: new weldr client compatibility for test scripts

Browse source 
- Handle the array responses from the new weldr-client (>= 35.6).
- Move the `get_build_info` function to shared_libs.sh to source and
  reuse in multiple places.
This commit is contained in:
Achilleas Koutsou 2022-08-30 15:59:01 +02:00 • committed by Tom Gundersen
parent 8e24f5720d
commit 3b14828669
25 changed files with 57 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/cases/shared_lib.sh
View file

@ -7,12 +7,12 @@ function nvrGreaterOrEqual {
set +e
rpm_version=$(rpm -q --qf "%{version}" "${rpm_name}")
rpmdev-vercmp "${rpm_version}" "${min_version}"
rpmdev-vercmp "${rpm_version}" "${min_version}" 1>&2
if [ "$?" != "12" ]; then
# 0 - rpm_version == min_version
# 11 - rpm_version > min_version
# 12 - rpm_version < min_version
echo "DEBUG: ${rpm_version} >= ${min_version}"
echo "DEBUG: ${rpm_version} >= ${min_version}" 1>&2
set -e
return
fi
@ -20,3 +20,16 @@ function nvrGreaterOrEqual {
set -e
false
}
function get_build_info() {
local key="$1"
local fname="$2"
if rpm -q --quiet weldr-client; then
key=".body${key}"
if nvrGreaterOrEqual "weldr-client" "35.6"; then
key=".[0]${key}"
fi
fi
jq -r "${key}" "${fname}"
}