diff --git a/suites/upgrade/rbd-double/0-cluster/start.yaml b/suites/upgrade/rbd-double/0-cluster/start.yaml
new file mode 100644
index 00000000000..01747e42056
--- /dev/null
+++ b/suites/upgrade/rbd-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/rbd-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rbd-double/1-bobtail-install/bobtail.yaml
new file mode 100644
index 00000000000..c676a5582d5
--- /dev/null
+++ b/suites/upgrade/rbd-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+     branch: bobtail
+- ceph:
diff --git a/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml b/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml
new file mode 100644
index 00000000000..9123db83bbb
--- /dev/null
+++ b/suites/upgrade/rbd-double/2-bobtail-workload/import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: bobtail
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml
new file mode 100644
index 00000000000..4dee94e343e
--- /dev/null
+++ b/suites/upgrade/rbd-double/3-upgrade/cuttlefish.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: cuttlefish
diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml
new file mode 100644
index 00000000000..a8508353e78
--- /dev/null
+++ b/suites/upgrade/rbd-double/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/rbd-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644
index 00000000000..78e14e9472a
--- /dev/null
+++ b/suites/upgrade/rbd-double/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/rbd-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644
index 00000000000..dbcd013b3f0
--- /dev/null
+++ b/suites/upgrade/rbd-double/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/rbd-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml
new file mode 100644
index 00000000000..e8fe288f657
--- /dev/null
+++ b/suites/upgrade/rbd-double/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/rbd-double/5-cuttlefish-workload/api.yaml b/suites/upgrade/rbd-double/5-cuttlefish-workload/api.yaml
new file mode 100644
index 00000000000..f0f81ff8af3
--- /dev/null
+++ b/suites/upgrade/rbd-double/5-cuttlefish-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish 
+     clients:
+        client.0:
+           - rbd/test_librbd.sh
diff --git a/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml b/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml
new file mode 100644
index 00000000000..520b584c0a8
--- /dev/null
+++ b/suites/upgrade/rbd-double/5-cuttlefish-workload/cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: cuttlefish 
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh
diff --git a/suites/upgrade/rbd-double/6-upgrade-next/next.yaml b/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
new file mode 100644
index 00000000000..3e8e04cadbf
--- /dev/null
+++ b/suites/upgrade/rbd-double/6-upgrade-next/next.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: next
diff --git a/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml
new file mode 100644
index 00000000000..d21800684d3
--- /dev/null
+++ b/suites/upgrade/rbd-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/rbd-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/rbd-double/7-restart/mon-mds-osd.yaml
new file mode 100644
index 00000000000..78e14e9472a
--- /dev/null
+++ b/suites/upgrade/rbd-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/rbd-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/rbd-double/7-restart/osd-mds-mon.yaml
new file mode 100644
index 00000000000..dbcd013b3f0
--- /dev/null
+++ b/suites/upgrade/rbd-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/rbd-double/8-next-workload/import-export.yaml b/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
new file mode 100644
index 00000000000..c603b532648
--- /dev/null
+++ b/suites/upgrade/rbd-double/8-next-workload/import-export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/rbd-double/8-next-workload/python.yaml b/suites/upgrade/rbd-double/8-next-workload/python.yaml
new file mode 100644
index 00000000000..8a98bc91fcc
--- /dev/null
+++ b/suites/upgrade/rbd-double/8-next-workload/python.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+     branch: next
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh
diff --git a/suites/upgrade/rgw-double/0-cluster/start.yaml b/suites/upgrade/rgw-double/0-cluster/start.yaml
new file mode 100644
index 00000000000..01747e42056
--- /dev/null
+++ b/suites/upgrade/rgw-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/rgw-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rgw-double/1-bobtail-install/bobtail.yaml
new file mode 100644
index 00000000000..c676a5582d5
--- /dev/null
+++ b/suites/upgrade/rgw-double/1-bobtail-install/bobtail.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+     branch: bobtail
+- ceph:
diff --git a/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml b/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml
new file mode 100644
index 00000000000..573cffbc30a
--- /dev/null
+++ b/suites/upgrade/rgw-double/2-bobtail-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
diff --git a/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml
new file mode 100644
index 00000000000..4dee94e343e
--- /dev/null
+++ b/suites/upgrade/rgw-double/3-upgrade/cuttlefish.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: cuttlefish
diff --git a/suites/upgrade/rgw-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_mds_osd_mon.yaml
new file mode 100644
index 00000000000..a8508353e78
--- /dev/null
+++ b/suites/upgrade/rgw-double/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/rgw-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_mon_mds_osd.yaml
new file mode 100644
index 00000000000..78e14e9472a
--- /dev/null
+++ b/suites/upgrade/rgw-double/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/rgw-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_osd_mds_mon.yaml
new file mode 100644
index 00000000000..dbcd013b3f0
--- /dev/null
+++ b/suites/upgrade/rgw-double/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/rgw-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rgw-double/4-restart/upgrade_osd_mon_mds.yaml
new file mode 100644
index 00000000000..e8fe288f657
--- /dev/null
+++ b/suites/upgrade/rgw-double/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/rgw-double/5-cuttlefish-workload/readwrite.yaml b/suites/upgrade/rgw-double/5-cuttlefish-workload/readwrite.yaml
new file mode 100644
index 00000000000..d3166f117da
--- /dev/null
+++ b/suites/upgrade/rgw-double/5-cuttlefish-workload/readwrite.yaml
@@ -0,0 +1,13 @@
+tasks:
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500
diff --git a/suites/upgrade/rgw-double/5-cuttlefish-workload/s3tests.yaml b/suites/upgrade/rgw-double/5-cuttlefish-workload/s3tests.yaml
new file mode 100644
index 00000000000..573cffbc30a
--- /dev/null
+++ b/suites/upgrade/rgw-double/5-cuttlefish-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
diff --git a/suites/upgrade/rgw-double/5-cuttlefish-workload/swift.yaml b/suites/upgrade/rgw-double/5-cuttlefish-workload/swift.yaml
new file mode 100644
index 00000000000..45e2fc9cc30
--- /dev/null
+++ b/suites/upgrade/rgw-double/5-cuttlefish-workload/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0
diff --git a/suites/upgrade/rgw-double/6-upgrade-next/next.yaml b/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
new file mode 100644
index 00000000000..3e8e04cadbf
--- /dev/null
+++ b/suites/upgrade/rgw-double/6-upgrade-next/next.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: next
diff --git a/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml
new file mode 100644
index 00000000000..d21800684d3
--- /dev/null
+++ b/suites/upgrade/rgw-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/rgw-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/rgw-double/7-restart/mon-mds-osd.yaml
new file mode 100644
index 00000000000..78e14e9472a
--- /dev/null
+++ b/suites/upgrade/rgw-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/rgw-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/rgw-double/7-restart/osd-mds-mon.yaml
new file mode 100644
index 00000000000..dbcd013b3f0
--- /dev/null
+++ b/suites/upgrade/rgw-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/rgw-double/8-next-workload/readwrite.yaml b/suites/upgrade/rgw-double/8-next-workload/readwrite.yaml
new file mode 100644
index 00000000000..d3166f117da
--- /dev/null
+++ b/suites/upgrade/rgw-double/8-next-workload/readwrite.yaml
@@ -0,0 +1,13 @@
+tasks:
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500
diff --git a/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
new file mode 100644
index 00000000000..573cffbc30a
--- /dev/null
+++ b/suites/upgrade/rgw-double/8-next-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
diff --git a/suites/upgrade/rgw-double/8-next-workload/swift.yaml b/suites/upgrade/rgw-double/8-next-workload/swift.yaml
new file mode 100644
index 00000000000..45e2fc9cc30
--- /dev/null
+++ b/suites/upgrade/rgw-double/8-next-workload/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0