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

diff --git a/suites/upgrade/fs-double/0-cluster/start.yaml b/suites/upgrade/fs-double/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade/fs-double/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-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml
new file mode 100644 (file)
index 0000000..f76c841
--- /dev/null
+++ b/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,5 @@
+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
new file mode 100644 (file)
index 0000000..830893e
--- /dev/null
+++ b/suites/upgrade/fs-double/2-bobtail-workload/blogbench.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..d3aac66
--- /dev/null
+++ b/suites/upgrade/fs-double/2-bobtail-workload/dbench.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..77ce802
--- /dev/null
+++ b/suites/upgrade/fs-double/2-bobtail-workload/iogen.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..4dee94e
--- /dev/null
+++ b/suites/upgrade/fs-double/3-upgrade-cuttlefish/cuttlefish.yaml
@@ -0,0 +1,4 @@
+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
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade/fs-double/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-double/4-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/4-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade/fs-double/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-double/4-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/4-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade/fs-double/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-double/5-cuttlefish-workload/fsstress.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml
new file mode 100644 (file)
index 0000000..101b1ca
--- /dev/null
+++ b/suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..247d807
--- /dev/null
+++ b/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..7415dd9
--- /dev/null
+++ b/suites/upgrade/fs-double/5-cuttlefish-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-double/5-cuttlefish-workload/tiobench.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml
new file mode 100644 (file)
index 0000000..20e99ed
--- /dev/null
+++ b/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..3e8e04c
--- /dev/null
+++ b/suites/upgrade/fs-double/6-upgrade-next/next.yaml
@@ -0,0 +1,4 @@
+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
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade/fs-double/7-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-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/7-restart/mon-mds-osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade/fs-double/7-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-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/7-restart/osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade/fs-double/7-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-double/8-next-workload/fsstress.yaml b/suites/upgrade/fs-double/8-next-workload/fsstress.yaml
new file mode 100644 (file)
index 0000000..101b1ca
--- /dev/null
+++ b/suites/upgrade/fs-double/8-next-workload/fsstress.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..247d807
--- /dev/null
+++ b/suites/upgrade/fs-double/8-next-workload/iogen.yaml
@@ -0,0 +1,6 @@
+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
new file mode 100644 (file)
index 0000000..7415dd9
--- /dev/null
+++ b/suites/upgrade/fs-double/8-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-double/8-next-workload/tiobench.yaml b/suites/upgrade/fs-double/8-next-workload/tiobench.yaml
new file mode 100644 (file)
index 0000000..20e99ed
--- /dev/null
+++ b/suites/upgrade/fs-double/8-next-workload/tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        all:
+           - suites/tiobench.sh