Revert "upgrade: add double-hop bobtail -> cuttlefish -> next fs tests"

This reverts commit fbdb7774bb381ff1426650c47cdb36282c4c77d2.

We don't care about bobtail fs.

diff --git a/suites/upgrade/fs-double/0-cluster/start.yaml b/suites/upgrade/fs-double/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/upgrade/fs-double/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-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml
deleted file mode 100644 (file)
index f76c841..0000000
--- a/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- ceph-fuse:

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

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

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

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

diff --git a/suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml b/suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/fs-double/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-double/4-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/4-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/fs-double/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-double/4-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/4-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/fs-double/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-double/5-cuttlefish-workload/fsstress.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml
deleted file mode 100644 (file)
index 101b1ca..0000000
--- a/suites/upgrade/fs-double/5-cuttlefish-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-double/5-cuttlefish-workload/iogen.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml
deleted file mode 100644 (file)
index 247d807..0000000
--- a/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - suites/iogen.sh

diff --git a/suites/upgrade/fs-double/5-cuttlefish-workload/kernel-untar-build.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/kernel-untar-build.yaml
deleted file mode 100644 (file)
index 7415dd9..0000000
--- a/suites/upgrade/fs-double/5-cuttlefish-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-double/5-cuttlefish-workload/tiobench.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml
deleted file mode 100644 (file)
index 20e99ed..0000000
--- a/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - suites/tiobench.sh

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

diff --git a/suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/fs-double/7-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-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/7-restart/mon-mds-osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/fs-double/7-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-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/7-restart/osd-mds-mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/fs-double/7-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-double/8-next-workload/fsstress.yaml b/suites/upgrade/fs-double/8-next-workload/fsstress.yaml
deleted file mode 100644 (file)
index 101b1ca..0000000
--- a/suites/upgrade/fs-double/8-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-double/8-next-workload/iogen.yaml b/suites/upgrade/fs-double/8-next-workload/iogen.yaml
deleted file mode 100644 (file)
index 247d807..0000000
--- a/suites/upgrade/fs-double/8-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-double/8-next-workload/kernel-untar-build.yaml b/suites/upgrade/fs-double/8-next-workload/kernel-untar-build.yaml
deleted file mode 100644 (file)
index 7415dd9..0000000
--- a/suites/upgrade/fs-double/8-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-double/8-next-workload/tiobench.yaml b/suites/upgrade/fs-double/8-next-workload/tiobench.yaml
deleted file mode 100644 (file)
index 20e99ed..0000000
--- a/suites/upgrade/fs-double/8-next-workload/tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        all:
-           - suites/tiobench.sh