fstests-bld overlayfs updates
cover fstests-bld overlayfs updates
Hi Ted,
The first patch enables testing the new overlayfs verity feature, which is NOT the same as saying that overlayfs supports fsverity.
The other two are cleanups and fixes to overlayfs configs.
Thanks,
Amir.
Amir Goldstein (3):
test-appliance: enable verity for testing overlay over ext4
test-appliance: remove redudant overlay configs
test-appliance: skip overlayfs tests from base fs exclude list
.../files/root/fs/overlay/cfg/large-ext4 | 14 -------------- test-appliance/files/root/fs/overlay/cfg/large-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4 | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4.exclude | 1 - test-appliance/files/root/fs/overlay/cfg/small-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-xfs.exclude | 1 - test-appliance/files/root/fs/overlay/config | 2 +- test-appliance/files/root/runtests.sh | 1 + 8 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
Signature · 1 line
2.34.1
PATCH 1/3 test-appliance: enable verity for testing overlay over ext4
Add -O verity for ext4 formatted for overlay tests, so that overlay verity feature could be tested.
--- test-appliance/files/root/fs/overlay/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
test-appliance/files/root/fs/overlay/config +1 -1
@@ -55,7 +55,7 @@ function __mkfs() case "$BASE_FSTYPE" in ext4) - /sbin/mke2fs -F -q -t ext4 "$dev" + /sbin/mke2fs -F -q -t ext4 -O verity "$dev" ;; xfs) mkfs.xfs -f -m rmapbt=1,reflink=1 "$dev"
Signature · 1 line
2.34.1
PATCH 2/3 test-appliance: remove redudant overlay configs
In reply to Amir GoldsteinSince the introduction of syntax "-c ext4:overlay/small" - 5fec599 ("test-appliance: update config syntax to specify primary fstype"), there is no need for the -ext4 and -xfs ovelray config file variants, so remove them.
--- .../files/root/fs/overlay/cfg/large-ext4 | 14 -------------- test-appliance/files/root/fs/overlay/cfg/large-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4 | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4.exclude | 1 - test-appliance/files/root/fs/overlay/cfg/small-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-xfs.exclude | 1 - 6 files changed, 58 deletions(-) delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
test-appliance/files/root/fs/overlay/cfg/large-ext4 deleted +0 -14
@@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=ext4 -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch
test-appliance/files/root/fs/overlay/cfg/large-xfs deleted +0 -14
@@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=xfs -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch
test-appliance/files/root/fs/overlay/cfg/small-ext4 deleted +0 -14
@@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -SIZE=small -FSTESTTYP=ext4 -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch
test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude deleted +0 -1
@@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV.
test-appliance/files/root/fs/overlay/cfg/small-xfs deleted +0 -14
@@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -FSTESTTYP=xfs -SIZE=small -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch
test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude deleted +0 -1
@@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV.
Signature · 1 line
2.34.1
PATCH 3/3 test-appliance: skip overlayfs tests from base fs exclude list
In reply to Amir Goldsteinwhen running overlayfs test with syntax "-c ext4:overlay/small" skip tests that are listed in the base fs exclude list (ext4/exclude).
--- test-appliance/files/root/runtests.sh | 1 + 1 file changed, 1 insertion(+)
test-appliance/files/root/runtests.sh +1 -0
@@ -544,6 +544,7 @@ do files=() for i in "/root/fs/global_exclude" \ "/root/fs/$FS/exclude" \ + "/root/fs/$BASE_FSTYPE/exclude" \ "/root/fs/$FS/cfg/$TC.exclude" \ "/root/fs/exclude.$XFSTESTS_FLAVOR" ; do test -f "$i" && files+=("$i")
Signature · 1 line
2.34.1
Quoted 8 lines · Amir Goldstein
Hi Ted,
The first patch enables testing the new overlayfs verity feature, which is NOT the same as saying that overlayfs supports fsverity.
The other two are cleanups and fixes to overlayfs configs.
Hi Ted,
Ping.
Did these two small patches get lost?
FYI, Alexander's overlayfs verity patches are queued for 6.6 and his overlay/verity fstests have already been merged to fstests release v2023.07.23.
It would be great if fstests-bld support to test this feature would be merged as well.
Thanks,
Amir.
Quoted 25 lines
Amir Goldstein (3):
test-appliance: enable verity for testing overlay over ext4
test-appliance: remove redudant overlay configs
test-appliance: skip overlayfs tests from base fs exclude list.../files/root/fs/overlay/cfg/large-ext4 | 14 -------------- test-appliance/files/root/fs/overlay/cfg/large-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4 | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4.exclude | 1 - test-appliance/files/root/fs/overlay/cfg/small-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-xfs.exclude | 1 - test-appliance/files/root/fs/overlay/config | 2 +- test-appliance/files/root/runtests.sh | 1 + 8 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude--
2.34.1