qa: merge multimds:verify with fs:verify

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

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

diff --git a/qa/suites/fs/verify/clusters/fixed-2-ucephfs.yaml b/qa/suites/fs/verify/clusters/fixed-2-ucephfs.yaml
deleted file mode 120000 (symlink)
index b0c41a8..0000000
--- a/qa/suites/fs/verify/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/verify/mount/kclient/+ b/qa/suites/fs/verify/mount/kclient/+
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/fs/verify/mount/kclient/k-testing.yaml b/qa/suites/fs/verify/mount/kclient/k-testing.yaml
new file mode 120000 (symlink)
index 0000000..bec80be
--- /dev/null
+++ b/qa/suites/fs/verify/mount/kclient/k-testing.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml
\ No newline at end of file

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

diff --git a/qa/suites/fs/verify/mount/kclient/ms-die-on-skipped.yaml b/qa/suites/fs/verify/mount/kclient/ms-die-on-skipped.yaml
new file mode 120000 (symlink)
index 0000000..1912a0c
--- /dev/null
+++ b/qa/suites/fs/verify/mount/kclient/ms-die-on-skipped.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml
\ No newline at end of file

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

diff --git a/qa/suites/fs/verify/ranks/1.yaml b/qa/suites/fs/verify/ranks/1.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/fs/verify/ranks/3.yaml b/qa/suites/fs/verify/ranks/3.yaml
new file mode 100644 (file)
index 0000000..9ed043c
--- /dev/null
+++ b/qa/suites/fs/verify/ranks/3.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    cephfs:
+      max_mds: 3
+  check-counter:
+    counters:
+      mds:
+        - mds.exported
+        - mds.imported

diff --git a/qa/suites/fs/verify/ranks/5.yaml b/qa/suites/fs/verify/ranks/5.yaml
new file mode 100644 (file)
index 0000000..ed89cef
--- /dev/null
+++ b/qa/suites/fs/verify/ranks/5.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    cephfs:
+      max_mds: 5
+  check-counter:
+    counters:
+      mds:
+        - mds.exported
+        - mds.imported

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

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

diff --git a/qa/suites/fs/verify/tasks/dbench.yaml b/qa/suites/fs/verify/tasks/dbench.yaml
new file mode 120000 (symlink)
index 0000000..b0f876c
--- /dev/null
+++ b/qa/suites/fs/verify/tasks/dbench.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/verify/tasks/fsstress.yaml b/qa/suites/fs/verify/tasks/fsstress.yaml
new file mode 120000 (symlink)
index 0000000..c2e859f
--- /dev/null
+++ b/qa/suites/fs/verify/tasks/fsstress.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/% b/qa/suites/multimds/verify/%
deleted file mode 100644 (file)
index e69de29..0000000

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

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

diff --git a/qa/suites/multimds/verify/centos_latest.yaml b/qa/suites/multimds/verify/centos_latest.yaml
deleted file mode 120000 (symlink)
index bd9854e..0000000
--- a/qa/suites/multimds/verify/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

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

diff --git a/qa/suites/multimds/verify/clusters/3-mds.yaml b/qa/suites/multimds/verify/clusters/3-mds.yaml
deleted file mode 120000 (symlink)
index d7ec418..0000000
--- a/qa/suites/multimds/verify/clusters/3-mds.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/3-mds.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/clusters/9-mds.yaml b/qa/suites/multimds/verify/clusters/9-mds.yaml
deleted file mode 120000 (symlink)
index eeb9225..0000000
--- a/qa/suites/multimds/verify/clusters/9-mds.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/9-mds.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/conf b/qa/suites/multimds/verify/conf
deleted file mode 120000 (symlink)
index 16e8cc4..0000000
--- a/qa/suites/multimds/verify/conf
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/conf
\ No newline at end of file

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

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

diff --git a/qa/suites/multimds/verify/mount/kclient/+ b/qa/suites/multimds/verify/mount/kclient/+
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/multimds/verify/mount/kclient/k-testing.yaml b/qa/suites/multimds/verify/mount/kclient/k-testing.yaml
deleted file mode 120000 (symlink)
index bec80be..0000000
--- a/qa/suites/multimds/verify/mount/kclient/k-testing.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/mount.yaml b/qa/suites/multimds/verify/mount/kclient/mount.yaml
deleted file mode 120000 (symlink)
index 9967f23..0000000
--- a/qa/suites/multimds/verify/mount/kclient/mount.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient/mount.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml b/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml
deleted file mode 120000 (symlink)
index 1912a0c..0000000
--- a/qa/suites/multimds/verify/mount/kclient/ms-die-on-skipped.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient/overrides/ms-die-on-skipped.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/objectstore-ec b/qa/suites/multimds/verify/objectstore-ec
deleted file mode 120000 (symlink)
index affe294..0000000
--- a/qa/suites/multimds/verify/objectstore-ec
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/objectstore-ec
\ No newline at end of file

diff --git a/qa/suites/multimds/verify/overrides/% b/qa/suites/multimds/verify/overrides/%
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/multimds/verify/overrides/fuse-default-perm-no.yaml b/qa/suites/multimds/verify/overrides/fuse-default-perm-no.yaml
deleted file mode 120000 (symlink)
index 1da96a1..0000000
--- a/qa/suites/multimds/verify/overrides/fuse-default-perm-no.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/fuse/default-perm/no.yaml
\ No newline at end of file

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

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

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