renamed the folders and files appropriately

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

diff --git a/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml
new file mode 100644 (file)
index 0000000..b6f03ba
--- /dev/null
+++ b/suites/upgrade/mixed-mons/5-dumpling-workload/cephtool.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - cephtool/test.sh
+        - mon/pool_ops.sh

diff --git a/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml b/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml
deleted file mode 100644 (file)
index 8648784..0000000
--- a/suites/upgrade/mixed-mons/5-next-workload/cephtool.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: cuttlefish
-    clients:
-      all:
-        - cephtool/test.sh
-        - mon/pool_ops.sh

diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml
deleted file mode 100644 (file)
index 9b9f1f2..0000000
--- a/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-        - cls

diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml
deleted file mode 100644 (file)
index 60a44cd..0000000
--- a/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/rados-double/5-dumpling-workload/api.yaml b/suites/upgrade/rados-double/5-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..9b9f1f2
--- /dev/null
+++ b/suites/upgrade/rados-double/5-dumpling-workload/api.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
+        - cls

diff --git a/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml b/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml
new file mode 100644 (file)
index 0000000..60a44cd
--- /dev/null
+++ b/suites/upgrade/rados-double/5-dumpling-workload/load-gen-mix.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/load-gen-mix.sh

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

diff --git a/suites/upgrade/rados/5-dumpling-workload/snaps-few-objects.yaml b/suites/upgrade/rados/5-dumpling-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c540397
--- /dev/null
+++ b/suites/upgrade/rados/5-dumpling-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/5-next-workload/api.yaml b/suites/upgrade/rados/5-next-workload/api.yaml
deleted file mode 100644 (file)
index 9b9f1f2..0000000
--- a/suites/upgrade/rados/5-next-workload/api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    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
deleted file mode 100644 (file)
index c540397..0000000
--- a/suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-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/rbd/0-cluster/start.yaml b/suites/upgrade/rbd/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..cd071f9
--- /dev/null
+++ b/suites/upgrade/rbd/0-cluster/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:

diff --git a/suites/upgrade/rbd/1-bobtail-workload/import_export.yaml b/suites/upgrade/rbd/1-bobtail-workload/import_export.yaml
new file mode 100644 (file)
index 0000000..9123db8
--- /dev/null
+++ b/suites/upgrade/rbd/1-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/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/rbd/2-upgrade-to-dumpling/upgrade.yaml
new file mode 100644 (file)
index 0000000..e3e332c
--- /dev/null
+++ b/suites/upgrade/rbd/2-upgrade-to-dumpling/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: dumpling

diff --git a/suites/upgrade/rbd/3-restart/mon-osd-mds.yaml b/suites/upgrade/rbd/3-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..31a79e4
--- /dev/null
+++ b/suites/upgrade/rbd/3-restart/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/rbd/3-restart/osd-mon-mds.yaml b/suites/upgrade/rbd/3-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..e8fe288
--- /dev/null
+++ b/suites/upgrade/rbd/3-restart/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/4-dumpling-workload/api.yaml b/suites/upgrade/rbd/4-dumpling-workload/api.yaml
new file mode 100644 (file)
index 0000000..1ecaee4
--- /dev/null
+++ b/suites/upgrade/rbd/4-dumpling-workload/api.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/4-dumpling-workload/cls.yaml b/suites/upgrade/rbd/4-dumpling-workload/cls.yaml
new file mode 100644 (file)
index 0000000..9d62a69
--- /dev/null
+++ b/suites/upgrade/rbd/4-dumpling-workload/cls.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml b/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml
new file mode 100644 (file)
index 0000000..ae44a87
--- /dev/null
+++ b/suites/upgrade/rbd/4-dumpling-workload/import-export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/4-dumpling-workload/python.yaml b/suites/upgrade/rbd/4-dumpling-workload/python.yaml
new file mode 100644 (file)
index 0000000..5c6df6e
--- /dev/null
+++ b/suites/upgrade/rbd/4-dumpling-workload/python.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rbd/a/start.yaml b/suites/upgrade/rbd/a/start.yaml
deleted file mode 100644 (file)
index cd071f9..0000000
--- a/suites/upgrade/rbd/a/start.yaml
+++ /dev/null
@@ -1,14 +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:

diff --git a/suites/upgrade/rbd/b/import_export.yaml b/suites/upgrade/rbd/b/import_export.yaml
deleted file mode 100644 (file)
index 9123db8..0000000
--- a/suites/upgrade/rbd/b/import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     branch: bobtail
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/c/upgrade.yaml b/suites/upgrade/rbd/c/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rbd/c/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/rbd/d/mon-osd-mds.yaml b/suites/upgrade/rbd/d/mon-osd-mds.yaml
deleted file mode 100644 (file)
index 31a79e4..0000000
--- a/suites/upgrade/rbd/d/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/rbd/d/osd-mon-mds.yaml b/suites/upgrade/rbd/d/osd-mon-mds.yaml
deleted file mode 100644 (file)
index e8fe288..0000000
--- a/suites/upgrade/rbd/d/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/rbd/e/api.yaml b/suites/upgrade/rbd/e/api.yaml
deleted file mode 100644 (file)
index 1ecaee4..0000000
--- a/suites/upgrade/rbd/e/api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/rbd/e/cls.yaml b/suites/upgrade/rbd/e/cls.yaml
deleted file mode 100644 (file)
index 9d62a69..0000000
--- a/suites/upgrade/rbd/e/cls.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/rbd/e/import-export.yaml b/suites/upgrade/rbd/e/import-export.yaml
deleted file mode 100644 (file)
index ae44a87..0000000
--- a/suites/upgrade/rbd/e/import-export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/rbd/e/python.yaml b/suites/upgrade/rbd/e/python.yaml
deleted file mode 100644 (file)
index 5c6df6e..0000000
--- a/suites/upgrade/rbd/e/python.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/rgw/0-cluster/start.yaml b/suites/upgrade/rgw/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..8b1ebbe
--- /dev/null
+++ b/suites/upgrade/rgw/0-cluster/start.yaml
@@ -0,0 +1,20 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+  - client.1
+- - client.0
+tasks:
+- install:
+     branch: bobtail
+- ceph:
+    conf:
+      client:
+        client mount timeout: 600
+        rgw init timeout: 600
+- rgw: [client.0]

diff --git a/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.yaml b/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw/1-bobtail-workload/s3readwrite.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/1-bobtail-workload/s3tests.yaml b/suites/upgrade/rgw/1-bobtail-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..8020d79
--- /dev/null
+++ b/suites/upgrade/rgw/1-bobtail-workload/s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
+      force-branch: bobtail

diff --git a/suites/upgrade/rgw/1-bobtail-workload/swift.yaml b/suites/upgrade/rgw/1-bobtail-workload/swift.yaml
new file mode 100644 (file)
index 0000000..45e2fc9
--- /dev/null
+++ b/suites/upgrade/rgw/1-bobtail-workload/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml b/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml
new file mode 100644 (file)
index 0000000..e3e332c
--- /dev/null
+++ b/suites/upgrade/rgw/2-upgrade-to-dumpling/upgrade.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: dumpling

diff --git a/suites/upgrade/rgw/3-restart/mon-osd-mds.yaml b/suites/upgrade/rgw/3-restart/mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..ea8a58c
--- /dev/null
+++ b/suites/upgrade/rgw/3-restart/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, rgw.client.0]

diff --git a/suites/upgrade/rgw/3-restart/osd-mon-mds.yaml b/suites/upgrade/rgw/3-restart/osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..f9606ef
--- /dev/null
+++ b/suites/upgrade/rgw/3-restart/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, rgw.client.0]

diff --git a/suites/upgrade/rgw/4-dumpling-workload/readwrite.yaml b/suites/upgrade/rgw/4-dumpling-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..d3166f1
--- /dev/null
+++ b/suites/upgrade/rgw/4-dumpling-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/4-dumpling-workload/s3tests.yaml b/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
new file mode 100644 (file)
index 0000000..573cffb
--- /dev/null
+++ b/suites/upgrade/rgw/4-dumpling-workload/s3tests.yaml
@@ -0,0 +1,4 @@
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/4-dumpling-workload/swift.yaml b/suites/upgrade/rgw/4-dumpling-workload/swift.yaml
new file mode 100644 (file)
index 0000000..45e2fc9
--- /dev/null
+++ b/suites/upgrade/rgw/4-dumpling-workload/swift.yaml
@@ -0,0 +1,4 @@
+tasks:
+- swift:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/rgw/a/start.yaml b/suites/upgrade/rgw/a/start.yaml
deleted file mode 100644 (file)
index 8b1ebbe..0000000
--- a/suites/upgrade/rgw/a/start.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-  - client.1
-- - client.0
-tasks:
-- install:
-     branch: bobtail
-- ceph:
-    conf:
-      client:
-        client mount timeout: 600
-        rgw init timeout: 600
-- rgw: [client.0]

diff --git a/suites/upgrade/rgw/b/s3readwrite.yaml b/suites/upgrade/rgw/b/s3readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw/b/s3readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/b/s3tests.yaml b/suites/upgrade/rgw/b/s3tests.yaml
deleted file mode 100644 (file)
index 8020d79..0000000
--- a/suites/upgrade/rgw/b/s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0
-      force-branch: bobtail

diff --git a/suites/upgrade/rgw/b/swift.yaml b/suites/upgrade/rgw/b/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/rgw/b/swift.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- swift:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/c/upgrade.yaml b/suites/upgrade/rgw/c/upgrade.yaml
deleted file mode 100644 (file)
index e3e332c..0000000
--- a/suites/upgrade/rgw/c/upgrade.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- install.upgrade:
-     all:
-        branch: dumpling

diff --git a/suites/upgrade/rgw/d/mon-osd-mds.yaml b/suites/upgrade/rgw/d/mon-osd-mds.yaml
deleted file mode 100644 (file)
index ea8a58c..0000000
--- a/suites/upgrade/rgw/d/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, rgw.client.0]

diff --git a/suites/upgrade/rgw/d/osd-mon-mds.yaml b/suites/upgrade/rgw/d/osd-mon-mds.yaml
deleted file mode 100644 (file)
index f9606ef..0000000
--- a/suites/upgrade/rgw/d/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, rgw.client.0]

diff --git a/suites/upgrade/rgw/e/readwrite.yaml b/suites/upgrade/rgw/e/readwrite.yaml
deleted file mode 100644 (file)
index d3166f1..0000000
--- a/suites/upgrade/rgw/e/readwrite.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/e/s3tests.yaml b/suites/upgrade/rgw/e/s3tests.yaml
deleted file mode 100644 (file)
index 573cffb..0000000
--- a/suites/upgrade/rgw/e/s3tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/rgw/e/swift.yaml b/suites/upgrade/rgw/e/swift.yaml
deleted file mode 100644 (file)
index 45e2fc9..0000000
--- a/suites/upgrade/rgw/e/swift.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- swift:
-    client.0:
-      rgw_server: client.0