From 8960a51d2f10a9b50e7e8d296c6b9598ad181ca8 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Mon, 20 Nov 2023 16:00:42 +0100 Subject: [PATCH] Fix filesystems test The new partition rules are in osbuild-composer v94 and higher. --- test/cases/filesystem.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/cases/filesystem.sh b/test/cases/filesystem.sh index 8a752274f..9f01d470c 100644 --- a/test/cases/filesystem.sh +++ b/test/cases/filesystem.sh @@ -181,8 +181,7 @@ mountpoint = "/boot" size = 131072000 EOF -# Workaround for RHEL-9.3 nightly pipeline -if [[ "$VERSION_ID" != "9.3" ]]; then +if not nvrGreaterOrEqual "osbuild-composer" "94"; then tee -a "$BLUEPRINT_FILE" > /dev/null << EOF [[customizations.filesystem]] @@ -290,8 +289,7 @@ mountpoint = "/sysroot" size = 131072000 EOF -# Workaround for RHEL-9.3 nightly pipeline -if [[ "$VERSION_ID" != "9.3" ]]; then +if not nvrGreaterOrEqual "osbuild-composer" "94"; then tee -a "$BLUEPRINT_FILE" > /dev/null << EOF [[customizations.filesystem]] @@ -321,8 +319,7 @@ for MOUNTPOINT in '/etc' '/sys' '/proc' '/dev' '/run' '/bin' '/sbin' '/lib' '/li fi done -# Workaround for RHEL-9.3 nightly pipeline -if [[ "$VERSION_ID" != "9.3" ]]; then +if not nvrGreaterOrEqual "osbuild-composer" "94"; then for MOUNTPOINT in '/usr/bin' '/var/run' '/var/lock'; do if ! [[ $ERROR_MSG == *"$MOUNTPOINT"* ]]; then FAILED_MOUNTPOINTS+=("$MOUNTPOINT")