upgrade/fs: make single hop cuttlefish -> next (not bobtail -> next)

The bobtail ceph-fuse is buggy and these tests keep failing e.g. on umount,
but we don't really care about fixing the bobtail fs bugs.

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

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

diff --git a/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml b/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml
deleted file mode 100644 (file)
index 830893e..0000000
--- a/suites/upgrade/fs/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/2-bobtail-workload/dbench.yaml b/suites/upgrade/fs/2-bobtail-workload/dbench.yaml
deleted file mode 100644 (file)
index d3aac66..0000000
--- a/suites/upgrade/fs/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/2-bobtail-workload/iogen.yaml b/suites/upgrade/fs/2-bobtail-workload/iogen.yaml
deleted file mode 100644 (file)
index 77ce802..0000000
--- a/suites/upgrade/fs/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/2-cuttlefish-workload/blogbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..50161b0
--- /dev/null
+++ b/suites/upgrade/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/2-cuttlefish-workload/dbench.yaml b/suites/upgrade/fs/2-cuttlefish-workload/dbench.yaml
new file mode 100644 (file)
index 0000000..3bb9040
--- /dev/null
+++ b/suites/upgrade/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/2-cuttlefish-workload/iogen.yaml b/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml
new file mode 100644 (file)
index 0000000..c832d2f
--- /dev/null
+++ b/suites/upgrade/fs/2-cuttlefish-workload/iogen.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish
+     clients:
+        client.0:
+           - suites/iogen.sh