From ab306943d42724cbfbcca5adaecfe7c2e6de2eb0 Mon Sep 17 00:00:00 2001 From: Gianluca Zuccarelli Date: Wed, 23 Feb 2022 14:12:20 +0000 Subject: [PATCH] tests: check mountpoints with matching suffixes Filesystem mountpoints with matching suffixes, i.e. `/tmp` and `/var/tmp` was causing image builds to fail. Since this was fixed with #2141 the integration tests have been updated to check for this. --- 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 3463d4a05..a364389e4 100644 --- a/test/cases/filesystem.sh +++ b/test/cases/filesystem.sh @@ -147,11 +147,11 @@ mountpoint = "/" size = 2147483648 [[customizations.filesystem]] -mountpoint = "/var" +mountpoint = "/tmp" size = 131072000 [[customizations.filesystem]] -mountpoint = "/var/log" +mountpoint = "/var/tmp" size = 131072000 [[customizations.filesystem]] @@ -175,7 +175,7 @@ greenprint "💬 Checking mountpoints" INFO="$(sudo /usr/libexec/osbuild-composer-test/image-info "${IMAGE_FILENAME}")" FAILED_MOUNTPOINTS=() -for MOUNTPOINT in '/' '/var' '/var/log' '/var/log/audit' '/usr'; do +for MOUNTPOINT in '/' '/tmp' '/var/tmp' '/var/log/audit' '/usr'; do EXISTS=$(jq -e --arg m "$MOUNTPOINT" 'any(.fstab[] | .[] == $m; .)' <<< "${INFO}") if $EXISTS; then greenprint "INFO: mountpoint $MOUNTPOINT exists"