From: Sage Weil <sage@newdream.net>
Date: Fri, 6 Jan 2012 23:08:01 +0000 (-0800)
Subject: move multimon failure thrashing tests into regression
X-Git-Tag: v0.94.10~27^2^2~977
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfeaef451b540d0a1b4543860abec4909d917486;p=ceph.git

move multimon failure thrashing tests into regression

We need to test these nightly.
---

diff --git a/suites/regression/multimon/clusters/21.yaml b/suites/regression/multimon/clusters/21.yaml
new file mode 100644
index 000000000000..2d134788a6f0
--- /dev/null
+++ b/suites/regression/multimon/clusters/21.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
+- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mds.a]
+- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]
diff --git a/suites/regression/multimon/clusters/3.yaml b/suites/regression/multimon/clusters/3.yaml
new file mode 100644
index 000000000000..5646fab0716f
--- /dev/null
+++ b/suites/regression/multimon/clusters/3.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.0, osd.0]
+- [mon.1, mds.a]
+- [mon.2, osd.1]
diff --git a/suites/regression/multimon/clusters/6.yaml b/suites/regression/multimon/clusters/6.yaml
new file mode 100644
index 000000000000..662fc92b8de9
--- /dev/null
+++ b/suites/regression/multimon/clusters/6.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, osd.0]
+- [mon.b, mon.e, mds.a]
+- [mon.c, mon.f, osd.1]
diff --git a/suites/regression/multimon/clusters/9.yaml b/suites/regression/multimon/clusters/9.yaml
new file mode 100644
index 000000000000..b87a158dbb0a
--- /dev/null
+++ b/suites/regression/multimon/clusters/9.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, mon.g, osd.0]
+- [mon.b, mon.e, mon.h, mds.a]
+- [mon.c, mon.f, mon.i, osd.1]
diff --git a/suites/regression/multimon/tasks/mon_recovery.yaml b/suites/regression/multimon/tasks/mon_recovery.yaml
new file mode 100644
index 000000000000..6240d4c51493
--- /dev/null
+++ b/suites/regression/multimon/tasks/mon_recovery.yaml
@@ -0,0 +1,3 @@
+tasks:
+- ceph:
+- mon_recovery:
diff --git a/suites/stress/multimon/clusters/21.yaml b/suites/stress/multimon/clusters/21.yaml
deleted file mode 100644
index 2d134788a6f0..000000000000
--- a/suites/stress/multimon/clusters/21.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
-- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mds.a]
-- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]
diff --git a/suites/stress/multimon/clusters/3.yaml b/suites/stress/multimon/clusters/3.yaml
deleted file mode 100644
index 5646fab0716f..000000000000
--- a/suites/stress/multimon/clusters/3.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.0, osd.0]
-- [mon.1, mds.a]
-- [mon.2, osd.1]
diff --git a/suites/stress/multimon/clusters/6.yaml b/suites/stress/multimon/clusters/6.yaml
deleted file mode 100644
index 662fc92b8de9..000000000000
--- a/suites/stress/multimon/clusters/6.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, osd.0]
-- [mon.b, mon.e, mds.a]
-- [mon.c, mon.f, osd.1]
diff --git a/suites/stress/multimon/clusters/9.yaml b/suites/stress/multimon/clusters/9.yaml
deleted file mode 100644
index b87a158dbb0a..000000000000
--- a/suites/stress/multimon/clusters/9.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, mon.g, osd.0]
-- [mon.b, mon.e, mon.h, mds.a]
-- [mon.c, mon.f, mon.i, osd.1]
diff --git a/suites/stress/multimon/tasks/mon_recovery.yaml b/suites/stress/multimon/tasks/mon_recovery.yaml
deleted file mode 100644
index 6240d4c51493..000000000000
--- a/suites/stress/multimon/tasks/mon_recovery.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- ceph:
-- mon_recovery: