qa: merge snap tests for kcephfs/fs

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/suites/fs/snaps/clusters/1a3s-mds-1c-client.yaml b/qa/suites/fs/snaps/clusters/1a3s-mds-1c-client.yaml
new file mode 120000 (symlink)
index 0000000..4ab7357
--- /dev/null
+++ b/qa/suites/fs/snaps/clusters/1a3s-mds-1c-client.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1a3s-mds-1c-client.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml b/qa/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml
deleted file mode 120000 (symlink)
index b0c41a8..0000000
--- a/qa/suites/fs/snaps/clusters/fixed-2-ucephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/fixed-2-ucephfs.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/mount b/qa/suites/fs/snaps/mount
new file mode 120000 (symlink)
index 0000000..e3600f4
--- /dev/null
+++ b/qa/suites/fs/snaps/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/mount/.qa b/qa/suites/fs/snaps/mount/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/snaps/mount/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/mount/fuse.yaml b/qa/suites/fs/snaps/mount/fuse.yaml
deleted file mode 120000 (symlink)
index 0e55da9..0000000
--- a/qa/suites/fs/snaps/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/snaps/tasks/snaptests.yaml b/qa/suites/fs/snaps/tasks/snaptests.yaml
deleted file mode 100644 (file)
index 790c93c..0000000
--- a/qa/suites/fs/snaps/tasks/snaptests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/snaps

diff --git a/qa/suites/fs/snaps/tasks/workunit/snaps.yaml b/qa/suites/fs/snaps/tasks/workunit/snaps.yaml
new file mode 100644 (file)
index 0000000..790c93c
--- /dev/null
+++ b/qa/suites/fs/snaps/tasks/workunit/snaps.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - fs/snaps

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
deleted file mode 100644 (file)
index 790c93c..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/snaps