From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 20 Dec 2020 02:33:52 +0000 (-0800)
Subject: qa: move functional multimds tests to fs:functional
X-Git-Tag: v17.0.0~139^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=474cb0a9ca10815027c5be5a7a808ce764fd6617;p=ceph-ci.git

qa: move functional multimds tests to fs:functional

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

diff --git a/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml b/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml
deleted file mode 120000
index e5444ae2263..00000000000
--- a/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/1-mds-4-client-coloc.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/clusters/1a3s-mds-4c-client.yaml b/qa/suites/fs/functional/clusters/1a3s-mds-4c-client.yaml
new file mode 120000
index 00000000000..5c722a30bf2
--- /dev/null
+++ b/qa/suites/fs/functional/clusters/1a3s-mds-4c-client.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1a3s-mds-4c-client.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/tasks/exports.yaml b/qa/suites/fs/functional/tasks/exports.yaml
new file mode 100644
index 00000000000..76819fee9c3
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/exports.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - Replacing daemon mds
+tasks:
+- cephfs_test_runner:
+    fail_on_skip: false
+    modules:
+      - tasks.cephfs.test_exports
diff --git a/qa/suites/fs/functional/tasks/metrics.yaml b/qa/suites/fs/functional/tasks/metrics.yaml
new file mode 100644
index 00000000000..7e5ac4150ea
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/metrics.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cephfs_test_runner:
+    fail_on_skip: false
+    modules:
+      - tasks.cephfs.test_mds_metrics
diff --git a/qa/suites/fs/functional/tasks/multimds_misc.yaml b/qa/suites/fs/functional/tasks/multimds_misc.yaml
new file mode 100644
index 00000000000..8cdf9031082
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/multimds_misc.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - Scrub error on inode
+
+tasks:
+- cephfs_test_runner:
+    modules:
+      - tasks.cephfs.test_multimds_misc
diff --git a/qa/suites/fs/functional/tasks/snapshots.yaml b/qa/suites/fs/functional/tasks/snapshots.yaml
new file mode 100644
index 00000000000..d5951468ba5
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/snapshots.yaml
@@ -0,0 +1,16 @@
+overrides:
+  check-counter:
+    dry_run: true
+  ceph:
+    log-ignorelist:
+      - evicting unresponsive client
+      - RECENT_CRASH
+
+tasks:
+- exec:
+    mon.a:
+      - ceph config set mgr mgr/crash/warn_recent_interval 0
+- cephfs_test_runner:
+    fail_on_skip: false
+    modules:
+      - tasks.cephfs.test_snapshots
diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml
deleted file mode 100644
index 76819fee9c3..00000000000
--- a/qa/suites/multimds/basic/tasks/cephfs_test_exports.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - Replacing daemon mds
-tasks:
-- cephfs_test_runner:
-    fail_on_skip: false
-    modules:
-      - tasks.cephfs.test_exports
diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_mds_metrics.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_mds_metrics.yaml
deleted file mode 100644
index 7e5ac4150ea..00000000000
--- a/qa/suites/multimds/basic/tasks/cephfs_test_mds_metrics.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- cephfs_test_runner:
-    fail_on_skip: false
-    modules:
-      - tasks.cephfs.test_mds_metrics
diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_multimds_misc.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_multimds_misc.yaml
deleted file mode 100644
index 8cdf9031082..00000000000
--- a/qa/suites/multimds/basic/tasks/cephfs_test_multimds_misc.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - Scrub error on inode
-
-tasks:
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_multimds_misc
diff --git a/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml b/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml
deleted file mode 100644
index d5951468ba5..00000000000
--- a/qa/suites/multimds/basic/tasks/cephfs_test_snapshots.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  check-counter:
-    dry_run: true
-  ceph:
-    log-ignorelist:
-      - evicting unresponsive client
-      - RECENT_CRASH
-
-tasks:
-- exec:
-    mon.a:
-      - ceph config set mgr mgr/crash/warn_recent_interval 0
-- cephfs_test_runner:
-    fail_on_skip: false
-    modules:
-      - tasks.cephfs.test_snapshots