From: John Spray <john.spray@redhat.com>
Date: Thu, 20 Apr 2017 15:27:28 +0000 (+0100)
Subject: qa/suites: move mgr tests into rados suite
X-Git-Tag: v12.0.3~123^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08290933837450a14aa1a4198354cf3a6d573640;p=ceph.git

qa/suites: move mgr tests into rados suite

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/suites/mgr/basic/% b/qa/suites/mgr/basic/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/mgr/basic/clusters/2-node-mgr.yaml b/qa/suites/mgr/basic/clusters/2-node-mgr.yaml
deleted file mode 100644
index fc9dfbdc2445..000000000000
--- a/qa/suites/mgr/basic/clusters/2-node-mgr.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-roles:
-- [mgr.x, mon.a, mds.a, mds.c, osd.0, client.0]
-- [mgr.y, mon.b, mds.b, osd.1, osd.2, client.1]
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G
diff --git a/qa/suites/mgr/basic/debug/mgr.yaml b/qa/suites/mgr/basic/debug/mgr.yaml
deleted file mode 100644
index 068021eb6c7c..000000000000
--- a/qa/suites/mgr/basic/debug/mgr.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-      mgr:
-        debug mgr: 20
-        debug ms: 1
-      client:
-        debug client: 20
-        debug mgrc: 20
-        debug ms: 1
-      osd:
-        debug mgrc: 20
-      mds:
-        debug mgrc: 20
diff --git a/qa/suites/mgr/basic/objectstore b/qa/suites/mgr/basic/objectstore
deleted file mode 120000
index 4c8ebadfde87..000000000000
--- a/qa/suites/mgr/basic/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/mgr/basic/tasks/failover.yaml b/qa/suites/mgr/basic/tasks/failover.yaml
deleted file mode 100644
index b0c7b471ab0c..000000000000
--- a/qa/suites/mgr/basic/tasks/failover.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-tasks:
-  - install:
-  - ceph:
-  - cephfs_test_runner:
-      modules:
-        - tasks.mgr.test_failover
diff --git a/qa/suites/rados/mgr/% b/qa/suites/rados/mgr/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/mgr/clusters/2-node-mgr.yaml b/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
new file mode 100644
index 000000000000..fc9dfbdc2445
--- /dev/null
+++ b/qa/suites/rados/mgr/clusters/2-node-mgr.yaml
@@ -0,0 +1,6 @@
+roles:
+- [mgr.x, mon.a, mds.a, mds.c, osd.0, client.0]
+- [mgr.y, mon.b, mds.b, osd.1, osd.2, client.1]
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
diff --git a/qa/suites/rados/mgr/debug/mgr.yaml b/qa/suites/rados/mgr/debug/mgr.yaml
new file mode 100644
index 000000000000..068021eb6c7c
--- /dev/null
+++ b/qa/suites/rados/mgr/debug/mgr.yaml
@@ -0,0 +1,16 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        debug mon: 20
+      mgr:
+        debug mgr: 20
+        debug ms: 1
+      client:
+        debug client: 20
+        debug mgrc: 20
+        debug ms: 1
+      osd:
+        debug mgrc: 20
+      mds:
+        debug mgrc: 20
diff --git a/qa/suites/rados/mgr/objectstore b/qa/suites/rados/mgr/objectstore
new file mode 120000
index 000000000000..4c8ebadfde87
--- /dev/null
+++ b/qa/suites/rados/mgr/objectstore
@@ -0,0 +1 @@
+../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/rados/mgr/tasks/failover.yaml b/qa/suites/rados/mgr/tasks/failover.yaml
new file mode 100644
index 000000000000..b0c7b471ab0c
--- /dev/null
+++ b/qa/suites/rados/mgr/tasks/failover.yaml
@@ -0,0 +1,7 @@
+
+tasks:
+  - install:
+  - ceph:
+  - cephfs_test_runner:
+      modules:
+        - tasks.mgr.test_failover