upgrade/rados: refactor, expand matrix, start with cuttlefish

diff --git a/suites/upgrade/rados/0-cluster/start.yaml b/suites/upgrade/rados/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade/rados/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/rados/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644 (file)
index 0000000..b259af9
--- /dev/null
+++ b/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:

diff --git a/suites/upgrade/rados/2-cuttlefish-workload/api.yaml b/suites/upgrade/rados/2-cuttlefish-workload/api.yaml
new file mode 100644 (file)
index 0000000..6652658
--- /dev/null
+++ b/suites/upgrade/rados/2-cuttlefish-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: cuttlefish
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

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

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

diff --git a/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml
new file mode 100644 (file)
index 0000000..d218006
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_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/rados/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
new file mode 100644 (file)
index 0000000..a850835
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644 (file)
index 0000000..78e14e9
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_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/rados/4-restart/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]

diff --git a/suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644 (file)
index 0000000..dbcd013
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_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/rados/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rados/5-next-workload/api.yaml b/suites/upgrade/rados/5-next-workload/api.yaml
new file mode 100644 (file)
index 0000000..294713c
--- /dev/null
+++ b/suites/upgrade/rados/5-next-workload/api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: next
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml b/suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/rados/a/start.yaml b/suites/upgrade/rados/a/start.yaml
deleted file mode 100644 (file)
index b556eb0..0000000
--- a/suites/upgrade/rados/a/start.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-- workunit:
-     branch: bobtail
-     clients:
-        client.0:
-           - rados/load-gen-mix.sh
-- install.upgrade:
-     all:
-        branch: next

diff --git a/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml
deleted file mode 100644 (file)
index d218006..0000000
--- a/suites/upgrade/rados/b/upgrade_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/rados/b/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml
deleted file mode 100644 (file)
index a850835..0000000
--- a/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c]

diff --git a/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml
deleted file mode 100644 (file)
index 78e14e9..0000000
--- a/suites/upgrade/rados/b/upgrade_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/rados/b/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a]

diff --git a/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml
deleted file mode 100644 (file)
index dbcd013..0000000
--- a/suites/upgrade/rados/b/upgrade_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/rados/b/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a]

diff --git a/suites/upgrade/rados/c/tail.yaml b/suites/upgrade/rados/c/tail.yaml
deleted file mode 100644 (file)
index 085348d..0000000
--- a/suites/upgrade/rados/c/tail.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        client.0:
-           - rados/test.sh