From e601fb160cac716b0d430648be0f5920889731f8 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 23 Feb 2015 11:33:49 -0800 Subject: [PATCH] Fixes #10652 Removed firefly-giant dir as it's not needed Fixed branch assignment in dumpling-x Signed-off-by: Yuri Weinstein --- .../dumpling-x/basic/2-workload/rbd_cls.yaml | 2 +- suites/multi-version/firefly-giant/basic/% | 0 .../firefly-giant/basic/0-cluster/start.yaml | 10 ---------- .../firefly-giant/basic/1-install/firefly-giant.yaml | 7 ------- .../basic/2-workload/rados_snap_many_objects.yaml | 12 ------------ .../basic/2-workload/rbd_cli_import_export.yaml | 7 ------- .../firefly-giant/basic/2-workload/rgw_swift.yaml | 5 ----- 7 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 suites/multi-version/firefly-giant/basic/% delete mode 100644 suites/multi-version/firefly-giant/basic/0-cluster/start.yaml delete mode 100644 suites/multi-version/firefly-giant/basic/1-install/firefly-giant.yaml delete mode 100644 suites/multi-version/firefly-giant/basic/2-workload/rados_snap_many_objects.yaml delete mode 100644 suites/multi-version/firefly-giant/basic/2-workload/rbd_cli_import_export.yaml delete mode 100644 suites/multi-version/firefly-giant/basic/2-workload/rgw_swift.yaml 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 c7009f788c090..f079d351589bc 100644 --- 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 index e69de29bb2d1d..0000000000000 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 index 01747e4205612..0000000000000 --- 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 index 246b36884aa3f..0000000000000 --- 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 index 9e311c946e1a4..0000000000000 --- 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 index 49070827be09b..0000000000000 --- 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 index 4e82f5d462e04..0000000000000 --- 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 -- 2.39.5