upgrade: move fs upgrade tests to a separate suite

For now.. until we figure out why they keep failing!

diff --git a/suites/upgrade-fs/fs/0-cluster/start.yaml b/suites/upgrade-fs/fs/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade-fs/fs/0-cluster/start.yaml
@@ -0,0 +1,10 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0

diff --git a/suites/upgrade-fs/fs/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade-fs/fs/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644 (file)
index 0000000..b62bf7a
--- /dev/null
+++ b/suites/upgrade-fs/fs/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+     branch: cuttlefish
+- ceph:
+- ceph-fuse:

diff --git a/suites/upgrade-fs/fs/2-cuttlefish-workload/blogbench.yaml b/suites/upgrade-fs/fs/2-cuttlefish-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..50161b0
--- /dev/null
+++ b/suites/upgrade-fs/fs/2-cuttlefish-workload/blogbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish
+     clients:
+        client.0:
+           - suites/blogbench.sh

diff --git a/suites/upgrade-fs/fs/2-cuttlefish-workload/dbench.yaml b/suites/upgrade-fs/fs/2-cuttlefish-workload/dbench.yaml
new file mode 100644 (file)
index 0000000..3bb9040
--- /dev/null
+++ b/suites/upgrade-fs/fs/2-cuttlefish-workload/dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish
+     clients:
+        all:
+           - suites/dbench.sh

diff --git a/suites/upgrade-fs/fs/2-cuttlefish-workload/iogen.yaml b/suites/upgrade-fs/fs/2-cuttlefish-workload/iogen.yaml
new file mode 100644 (file)
index 0000000..c832d2f
--- /dev/null
+++ b/suites/upgrade-fs/fs/2-cuttlefish-workload/iogen.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish
+     clients:
+        client.0:
+           - suites/iogen.sh

diff --git a/suites/upgrade-fs/fs/3-upgrade/next.yaml b/suites/upgrade-fs/fs/3-upgrade/next.yaml
new file mode 100644 (file)
index 0000000..3e8e04c
--- /dev/null
+++ b/suites/upgrade-fs/fs/3-upgrade/next.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: next

diff --git a/suites/upgrade-fs/fs/4-restart/mds-mon-osd.yaml b/suites/upgrade-fs/fs/4-restart/mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade-fs/fs/4-restart/mds-mon-osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade-fs/fs/4-restart/mon-mds-osd.yaml b/suites/upgrade-fs/fs/4-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade-fs/fs/4-restart/mon-mds-osd.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade-fs/fs/4-restart/osd-mds-mon.yaml b/suites/upgrade-fs/fs/4-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade-fs/fs/4-restart/osd-mds-mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade-fs/fs/5-next-workload/fsstress.yaml b/suites/upgrade-fs/fs/5-next-workload/fsstress.yaml
new file mode 100644 (file)
index 0000000..101b1ca
--- /dev/null
+++ b/suites/upgrade-fs/fs/5-next-workload/fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        client.0:
+           - suites/fsstress.sh

diff --git a/suites/upgrade-fs/fs/5-next-workload/iogen.yaml b/suites/upgrade-fs/fs/5-next-workload/iogen.yaml
new file mode 100644 (file)
index 0000000..247d807
--- /dev/null
+++ b/suites/upgrade-fs/fs/5-next-workload/iogen.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        all:
+           - suites/iogen.sh

diff --git a/suites/upgrade-fs/fs/5-next-workload/kernel-untar-build.yaml b/suites/upgrade-fs/fs/5-next-workload/kernel-untar-build.yaml
new file mode 100644 (file)
index 0000000..7415dd9
--- /dev/null
+++ b/suites/upgrade-fs/fs/5-next-workload/kernel-untar-build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        all:
+           - kernel_untar_build.sh

diff --git a/suites/upgrade-fs/fs/5-next-workload/tiobench.yaml b/suites/upgrade-fs/fs/5-next-workload/tiobench.yaml
new file mode 100644 (file)
index 0000000..20e99ed
--- /dev/null
+++ b/suites/upgrade-fs/fs/5-next-workload/tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        all:
+           - suites/tiobench.sh

diff --git a/suites/upgrade/fs/0-cluster/start.yaml b/suites/upgrade/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/fs/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml
deleted file mode 100644 (file)
index b62bf7a..0000000
--- a/suites/upgrade/fs/1-cuttlefish-install/cuttlefish.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-     branch: cuttlefish
-- ceph:
-- ceph-fuse:

diff --git a/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml
deleted file mode 100644 (file)
index 50161b0..0000000
--- a/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        client.0:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml
deleted file mode 100644 (file)
index 3bb9040..0000000
--- a/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        all:
-           - suites/dbench.sh

diff --git a/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml b/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml
deleted file mode 100644 (file)
index c832d2f..0000000
--- a/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: cuttlefish
-     clients:
-        client.0:
-           - suites/iogen.sh

diff --git a/suites/upgrade/fs/3-upgrade/next.yaml b/suites/upgrade/fs/3-upgrade/next.yaml
deleted file mode 100644 (file)
index 3e8e04c..0000000
--- a/suites/upgrade/fs/3-upgrade/next.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: next

diff --git a/suites/upgrade/fs/4-restart/mds-mon-osd.yaml b/suites/upgrade/fs/4-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/fs/4-restart/mds-mon-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/fs/4-restart/mon-mds-osd.yaml b/suites/upgrade/fs/4-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/fs/4-restart/mon-mds-osd.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/fs/4-restart/osd-mds-mon.yaml b/suites/upgrade/fs/4-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/fs/4-restart/osd-mds-mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/fs/5-next-workload/fsstress.yaml b/suites/upgrade/fs/5-next-workload/fsstress.yaml
deleted file mode 100644 (file)
index 101b1ca..0000000
--- a/suites/upgrade/fs/5-next-workload/fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        client.0:
-           - suites/fsstress.sh

diff --git a/suites/upgrade/fs/5-next-workload/iogen.yaml b/suites/upgrade/fs/5-next-workload/iogen.yaml
deleted file mode 100644 (file)
index 247d807..0000000
--- a/suites/upgrade/fs/5-next-workload/iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - suites/iogen.sh

diff --git a/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml b/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml
deleted file mode 100644 (file)
index 7415dd9..0000000
--- a/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - kernel_untar_build.sh

diff --git a/suites/upgrade/fs/5-next-workload/tiobench.yaml b/suites/upgrade/fs/5-next-workload/tiobench.yaml
deleted file mode 100644 (file)
index 20e99ed..0000000
--- a/suites/upgrade/fs/5-next-workload/tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - suites/tiobench.sh