Fixes #10652

Removed firefly-giant dir as it's not needed
Fixed branch assignment in dumpling-x

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

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
index c7009f788c09054599568fabf55054bd709a2ea5..f079d351589bce31759ec875d93acacbd21c033a 100644 (file)
--- a/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml
+++ b/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml
@@ -1,6 +1,6 @@
 tasks:
 - workunit:
+    branch: dumpling
     clients:
-      branch: dumpling
       client.0:
       - cls/test_cls_rbd.sh

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

diff --git a/suites/multi-version/firefly-giant/basic/0-cluster/start.yaml b/suites/multi-version/firefly-giant/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index 01747e4..0000000
--- a/suites/multi-version/firefly-giant/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-giant/basic/1-install/firefly-giant.yaml b/suites/multi-version/firefly-giant/basic/1-install/firefly-giant.yaml
deleted file mode 100644 (file)
index 246b368..0000000
--- a/suites/multi-version/firefly-giant/basic/1-install/firefly-giant.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: firefly 
-- install.upgrade:
-   client.0:
-    branch: giant 
-- ceph:

diff --git a/suites/multi-version/firefly-giant/basic/2-workload/rados_snap_many_objects.yaml b/suites/multi-version/firefly-giant/basic/2-workload/rados_snap_many_objects.yaml
deleted file mode 100644 (file)
index 9e311c9..0000000
--- a/suites/multi-version/firefly-giant/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-giant/basic/2-workload/rbd_cli_import_export.yaml b/suites/multi-version/firefly-giant/basic/2-workload/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index 4907082..0000000
--- a/suites/multi-version/firefly-giant/basic/2-workload/rbd_cli_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/multi-version/firefly-giant/basic/2-workload/rgw_swift.yaml b/suites/multi-version/firefly-giant/basic/2-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 4e82f5d..0000000
--- a/suites/multi-version/firefly-giant/basic/2-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.0]
-- swift:
-    client.0:
-      rgw_server: client.0