Skip to content

Commit

Permalink
Invert wrong boolean condition in filesystem test
Browse files Browse the repository at this point in the history
the conditionals have been introduced in
8960a51
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
atodorov committed Jan 11, 2024
1 parent 22febe2 commit 6735e74
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/cases/filesystem.sh
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 6735e74

Please sign in to comment.