From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 29 Oct 2020 18:28:24 +0000 (-0700)
Subject: qa: merge snap tests for kcephfs/fs
X-Git-Tag: v17.0.0~721^2~25
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=276de433d69cc4d89989e8062095d8fbb527b28b;p=ceph-ci.git

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
index 00000000000..4ab7357dcbb
--- /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
index b0c41a89a1b..00000000000
--- 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
index 00000000000..e3600f453f2
--- /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
index a602a0353e7..00000000000
--- 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
index 0e55da9fb7a..00000000000
--- 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
index 790c93c2b17..00000000000
--- 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
index 00000000000..790c93c2b17
--- /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
index 790c93c2b17..00000000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_snaps.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/snaps