* [PATCH 1/3] test-appliance: enable verity for testing overlay over ext4
2023-06-25 13:50 [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
@ 2023-06-25 13:50 ` Amir Goldstein
2023-06-25 13:50 ` [PATCH 2/3] test-appliance: remove redudant overlay configs Amir Goldstein
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2023-06-25 13:50 UTC (permalink / raw)
To: Theodore Ts'o
Cc: Eric Biggers, Alexander Larsson, Leah Rumancik, fstests,
linux-unionfs
Add -O verity for ext4 formatted for overlay tests, so that overlay
verity feature could be tested.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
test-appliance/files/root/fs/overlay/config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-appliance/files/root/fs/overlay/config b/test-appliance/files/root/fs/overlay/config
index 7c50b19..f252a70 100644
--- a/test-appliance/files/root/fs/overlay/config
+++ b/test-appliance/files/root/fs/overlay/config
@@ -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"
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] test-appliance: remove redudant overlay configs
2023-06-25 13:50 [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
2023-06-25 13:50 ` [PATCH 1/3] test-appliance: enable verity for testing overlay over ext4 Amir Goldstein
@ 2023-06-25 13:50 ` Amir Goldstein
2023-06-25 13:50 ` [PATCH 3/3] test-appliance: skip overlayfs tests from base fs exclude list Amir Goldstein
2023-08-27 9:05 ` [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
3 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2023-06-25 13:50 UTC (permalink / raw)
To: Theodore Ts'o
Cc: Eric Biggers, Alexander Larsson, Leah Rumancik, fstests,
linux-unionfs
Since 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.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
.../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
diff --git a/test-appliance/files/root/fs/overlay/cfg/large-ext4 b/test-appliance/files/root/fs/overlay/cfg/large-ext4
deleted file mode 100644
index e401147..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/large-ext4
+++ /dev/null
@@ -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
diff --git a/test-appliance/files/root/fs/overlay/cfg/large-xfs b/test-appliance/files/root/fs/overlay/cfg/large-xfs
deleted file mode 100644
index 627dc29..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/large-xfs
+++ /dev/null
@@ -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
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4 b/test-appliance/files/root/fs/overlay/cfg/small-ext4
deleted file mode 100644
index ce750e5..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/small-ext4
+++ /dev/null
@@ -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
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude b/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
deleted file mode 100644
index a314778..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
+++ /dev/null
@@ -1 +0,0 @@
-overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV.
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs b/test-appliance/files/root/fs/overlay/cfg/small-xfs
deleted file mode 100644
index d0d8433..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/small-xfs
+++ /dev/null
@@ -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
diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude b/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
deleted file mode 100644
index a314778..0000000
--- a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude
+++ /dev/null
@@ -1 +0,0 @@
-overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV.
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] test-appliance: skip overlayfs tests from base fs exclude list
2023-06-25 13:50 [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
2023-06-25 13:50 ` [PATCH 1/3] test-appliance: enable verity for testing overlay over ext4 Amir Goldstein
2023-06-25 13:50 ` [PATCH 2/3] test-appliance: remove redudant overlay configs Amir Goldstein
@ 2023-06-25 13:50 ` Amir Goldstein
2023-08-27 9:05 ` [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
3 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2023-06-25 13:50 UTC (permalink / raw)
To: Theodore Ts'o
Cc: Eric Biggers, Alexander Larsson, Leah Rumancik, fstests,
linux-unionfs
when running overlayfs test with syntax "-c ext4:overlay/small"
skip tests that are listed in the base fs exclude list (ext4/exclude).
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
test-appliance/files/root/runtests.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/test-appliance/files/root/runtests.sh b/test-appliance/files/root/runtests.sh
index c4ddb73..4052481 100755
--- a/test-appliance/files/root/runtests.sh
+++ b/test-appliance/files/root/runtests.sh
@@ -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")
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] fstests-bld overlayfs updates
2023-06-25 13:50 [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
` (2 preceding siblings ...)
2023-06-25 13:50 ` [PATCH 3/3] test-appliance: skip overlayfs tests from base fs exclude list Amir Goldstein
@ 2023-08-27 9:05 ` Amir Goldstein
3 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2023-08-27 9:05 UTC (permalink / raw)
To: Theodore Ts'o
Cc: Eric Biggers, Alexander Larsson, Leah Rumancik, fstests,
linux-unionfs, Ext4
On Sun, Jun 25, 2023 at 4:50 PM Amir Goldstein <amir73il@gmail.com> wrote:
>
> 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.
>
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread