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

Invert wrong boolean condition in filesystem test

Browse source 
the conditionals have been introduced in
8960a51d2f
which states (emphasys mine):

> The new partition rules are **in** osbuild-composer v94 and higher.

but the condition was "not v94 or higher" and as a result it fails on
8.10 nightly with osbuild-composer v92 with:

failed to initialize osbuild manifest: The following custom mountpoints are not supported [\"/boot/firmware\" \"/foobar\"]

see https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5905865402
This commit is contained in:
Alexander Todorov 2024-01-11 11:22:23 +02:00 • committed by Alexander Todorov
parent 22febe2316
commit 6735e74897
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/cases/filesystem.sh
View file

@ -181,7 +181,7 @@ mountpoint = "/boot"
size = 131072000
EOF
if ! nvrGreaterOrEqual "osbuild-composer" "94"; then
if nvrGreaterOrEqual "osbuild-composer" "94"; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
[[customizations.filesystem]]
@ -293,7 +293,7 @@ mountpoint = "/sysroot"
size = 131072000
EOF
if ! nvrGreaterOrEqual "osbuild-composer" "94"; then
if nvrGreaterOrEqual "osbuild-composer" "94"; then
tee -a "$BLUEPRINT_FILE" > /dev/null << EOF
[[customizations.filesystem]]
@ -323,7 +323,7 @@ for MOUNTPOINT in '/etc' '/sys' '/proc' '/dev' '/run' '/bin' '/sbin' '/lib' '/li
fi
done
if ! nvrGreaterOrEqual "osbuild-composer" "94"; then
if nvrGreaterOrEqual "osbuild-composer" "94"; then
for MOUNTPOINT in '/usr/bin' '/var/run' '/var/lock'; do
if ! [[ $ERROR_MSG == *"$MOUNTPOINT"* ]]; then
FAILED_MOUNTPOINTS+=("$MOUNTPOINT")