Changed suite name from multi-versions to client-upgrade

Moved it under upgrades
Replaced rbd workunit

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit bcf7eabc5f0bcd0c6665bc047c076925fbc9bdf5)

diff --git a/suites/multi-version/dumpling-x/basic/% b/suites/multi-version/dumpling-x/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml b/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml
deleted file mode 100644 (file)
index 431d9fd..0000000
--- a/suites/multi-version/dumpling-x/basic/1-install/dumpling-x.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-   branch: dumpling
-- install.upgrade:
-   client.0:
-- ceph:

diff --git a/suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml b/suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
deleted file mode 100644 (file)
index b003009..0000000
--- a/suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/load-gen-big.sh

diff --git a/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml b/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index f079d35..0000000
--- a/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-      - cls/test_cls_rbd.sh

diff --git a/suites/multi-version/firefly-x/basic/% b/suites/multi-version/firefly-x/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/multi-version/firefly-x/basic/0-cluster/start.yaml b/suites/multi-version/firefly-x/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/multi-version/firefly-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0

diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml
deleted file mode 100644 (file)
index 53b15cb..0000000
--- a/suites/multi-version/firefly-x/basic/1-install/firefly-x.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-   branch: firefly 
-- install.upgrade:
-   client.0:
-- ceph:

diff --git a/suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml b/suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml
deleted file mode 100644 (file)
index 9e311c9..0000000
--- a/suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index 7fddb41..0000000
--- a/suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format

diff --git a/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml b/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 4e82f5d..0000000
--- a/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/% b/suites/upgrade/client-upgrade/dumpling-x/basic/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-x/basic/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/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml
new file mode 100644 (file)
index 0000000..431d9fd
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+   branch: dumpling
+- install.upgrade:
+   client.0:
+- ceph:

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
new file mode 100644 (file)
index 0000000..b003009
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/load-gen-big.sh

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..197ca41
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+      - rbd/import_export.sh

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/% b/suites/upgrade/client-upgrade/firefly-x/basic/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..01747e4
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-x/basic/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/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml
new file mode 100644 (file)
index 0000000..53b15cb
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+   branch: firefly 
+- install.upgrade:
+   client.0:
+- ceph:

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rados_snap_many_objects.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rados_snap_many_objects.yaml
new file mode 100644 (file)
index 0000000..9e311c9
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rados_snap_many_objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..7fddb41
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rgw_swift.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..4e82f5d
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rgw_swift.yaml
@@ -0,0 +1,5 @@
+tasks:
+- rgw: [client.0]
+- swift:
+    client.0:
+      rgw_server: client.0