From 5370685fa848a84c92f2e2666072d618f2d8e34a Mon Sep 17 00:00:00 2001
From: Amir Goldstein <amir73il@gmail.com>
Date: Thu, 22 Jun 2023 14:51:50 +0300
Subject: test-appliance: remove redudant overlay configs

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>
---
 test-appliance/files/root/fs/overlay/cfg/large-ext4        | 14 --------------
 test-appliance/files/root/fs/overlay/cfg/large-xfs         | 14 --------------
 test-appliance/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 --------------
 test-appliance/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 e401147d..00000000
--- 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 627dc295..00000000
--- 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 ce750e56..00000000
--- 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 a3147783..00000000
--- 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 d0d8433e..00000000
--- 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 a3147783..00000000
--- 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.
-- 
cgit 1.2.3-korg