From: Venky Shankar <vshankar@redhat.com>
Date: Mon, 31 Jul 2023 09:56:31 +0000 (+0530)
Subject: qa: move nfs (mgr/nfs) related tests to fs suite
X-Git-Tag: v18.2.1~84^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d06b821a53fd0094ae676279599cca03416fde6;p=ceph.git

qa: move nfs (mgr/nfs) related tests to fs suite

Fixes: https://tracker.ceph.com/issues/62236
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 10d67f121e636b03c65aacb54ee2019bffcb6811)
---

diff --git a/qa/suites/fs/nfs/% b/qa/suites/fs/nfs/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/nfs/.qa b/qa/suites/fs/nfs/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/nfs/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/begin b/qa/suites/fs/nfs/begin
new file mode 120000
index 000000000000..77af91f7d266
--- /dev/null
+++ b/qa/suites/fs/nfs/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/cluster/+ b/qa/suites/fs/nfs/cluster/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/nfs/cluster/.qa b/qa/suites/fs/nfs/cluster/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/nfs/cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/cluster/1-node.yaml b/qa/suites/fs/nfs/cluster/1-node.yaml
new file mode 100644
index 000000000000..bca1bdac6123
--- /dev/null
+++ b/qa/suites/fs/nfs/cluster/1-node.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: 1 ceph cluster with 1 mon, 1 mgr, 3 osds, 2 mds, 1 client
+roles:
+- - mon.a
+  - mgr.x
+  - mds.a
+  - mds.b
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/objectstore/.qa b/qa/suites/fs/nfs/objectstore/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/nfs/objectstore/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/objectstore/bluestore-bitmap.yaml b/qa/suites/fs/nfs/objectstore/bluestore-bitmap.yaml
new file mode 120000
index 000000000000..a59cf5175069
--- /dev/null
+++ b/qa/suites/fs/nfs/objectstore/bluestore-bitmap.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/overrides/.qa b/qa/suites/fs/nfs/overrides/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/nfs/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/overrides/ignorelist_health.yaml b/qa/suites/fs/nfs/overrides/ignorelist_health.yaml
new file mode 100644
index 000000000000..8bfe4dc6f618
--- /dev/null
+++ b/qa/suites/fs/nfs/overrides/ignorelist_health.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - overall HEALTH_
+      - \(FS_DEGRADED\)
+      - \(MDS_FAILED\)
+      - \(MDS_DEGRADED\)
+      - \(FS_WITH_FAILED_MDS\)
+      - \(MDS_DAMAGE\)
+      - \(MDS_ALL_DOWN\)
+      - \(MDS_UP_LESS_THAN_MAX\)
+      - \(FS_INLINE_DATA_DEPRECATED\)
+      - \(OSD_DOWN\)
diff --git a/qa/suites/fs/nfs/supported-random-distros$ b/qa/suites/fs/nfs/supported-random-distros$
new file mode 120000
index 000000000000..0862b4457b37
--- /dev/null
+++ b/qa/suites/fs/nfs/supported-random-distros$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/tasks/.qa b/qa/suites/fs/nfs/tasks/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/nfs/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/nfs/tasks/nfs.yaml b/qa/suites/fs/nfs/tasks/nfs.yaml
new file mode 100644
index 000000000000..aa966bff2142
--- /dev/null
+++ b/qa/suites/fs/nfs/tasks/nfs.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_nfs
diff --git a/qa/suites/orch/cephadm/workunits/task/test_nfs.yaml b/qa/suites/orch/cephadm/workunits/task/test_nfs.yaml
deleted file mode 100644
index 8448c1a2fa70..000000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_nfs.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-roles:
-- - host.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.a
-  - mgr.a
-  - client.0
-tasks:
-- install:
-- cephadm:
-- cephadm.shell:
-    host.a:
-      - ceph orch apply mds a
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_nfs