From 6735e74897d2eaed771f43b35ed33b257aca29e5 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 11 Jan 2024 11:22:23 +0200 Subject: [PATCH] Invert wrong boolean condition in filesystem test the conditionals have been introduced in https://github.com/osbuild/osbuild-composer/commit/8960a51d2f10a9b50e7e8d296c6b9598ad181ca8 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 --- test/cases/filesystem.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cases/filesystem.sh b/test/cases/filesystem.sh index 36428d213..0369ec5a8 100644 --- a/test/cases/filesystem.sh +++ b/test/cases/filesystem.sh @@ -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")