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

tests: Better implementation for ab30694

Browse source 
Don't remove the pre-existing mount-points from the blueprint b/c we
still need to assert on those.

Add `/tmp` and `/var/tmp` to exercise the case where mountpoints have
matching suffixes.
This commit is contained in:
Alexander Todorov 2022-02-25 13:49:00 +02:00 • committed by Tom Gundersen
parent 1459531148
commit cf8f05b57c
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/cases/filesystem.sh
View file

@ -162,6 +162,13 @@ size = "125 MiB"
mountpoint = "/usr" mountpoint = "/usr"
size = 2147483648 size = 2147483648
[[customizations.filesystem]]
mountpoint = "/tmp"
size = 131072000
[[customizations.filesystem]]
mountpoint = "/var/tmp"
size = 131072000
EOF EOF
build_image "$BLUEPRINT_FILE" rhel85-custom-filesystem qcow2 false build_image "$BLUEPRINT_FILE" rhel85-custom-filesystem qcow2 false
@ -175,7 +182,7 @@ greenprint "💬 Checking mountpoints"
INFO="$(sudo /usr/libexec/osbuild-composer-test/image-info "${IMAGE_FILENAME}")" INFO="$(sudo /usr/libexec/osbuild-composer-test/image-info "${IMAGE_FILENAME}")"
FAILED_MOUNTPOINTS=() FAILED_MOUNTPOINTS=()
for MOUNTPOINT in '/' '/var' '/var/log' '/var/log/audit' '/usr'; do for MOUNTPOINT in '/' '/var' '/var/log' '/var/log/audit' '/var/tmp' '/usr' '/tmp'; do
EXISTS=$(jq -e --arg m "$MOUNTPOINT" 'any(.fstab[] | .[] == $m; .)' <<< "${INFO}") EXISTS=$(jq -e --arg m "$MOUNTPOINT" 'any(.fstab[] | .[] == $m; .)' <<< "${INFO}")
if $EXISTS; then if $EXISTS; then
greenprint "INFO: mountpoint $MOUNTPOINT exists" greenprint "INFO: mountpoint $MOUNTPOINT exists"