From 14b03bc77f21f2e93b5ba61e42762da483e82b3f Mon Sep 17 00:00:00 2001 From: tamil Date: Fri, 1 Aug 2014 22:49:23 -0700 Subject: [PATCH] adding multi-version suite to test compatibility of clients running newer version of ceph against servers running older version. Signed-off-by: tamil --- suites/multi-version/dumpling-x/basic/% | 0 .../dumpling-x/basic/0-cluster/start.yaml | 10 ++++++++++ .../dumpling-x/basic/1-install/dumpling-firefly.yaml | 7 +++++++ .../dumpling-x/basic/1-install/dumpling-master.yaml | 7 +++++++ .../dumpling-x/basic/1-install/dumpling-next.yaml | 7 +++++++ .../basic/2-workload/rados_loadgen_big.yaml | 5 +++++ .../basic/2-workload/rados_snap_many_objects.yaml | 12 ++++++++++++ .../dumpling-x/basic/2-workload/rbd_cls.yaml | 5 +++++ .../dumpling-x/basic/2-workload/rgw_s3tests.yaml | 5 +++++ suites/multi-version/firefly-x/basic/% | 0 .../firefly-x/basic/0-cluster/start.yaml | 10 ++++++++++ .../firefly-x/basic/1-install/firefly-master.yaml | 7 +++++++ .../firefly-x/basic/1-install/firefly-next.yaml | 7 +++++++ .../basic/2-workload/rados_snap_many_objects.yaml | 12 ++++++++++++ .../basic/2-workload/rbd_cli_import_export.yaml | 7 +++++++ .../firefly-x/basic/2-workload/rgw_swift.yaml | 5 +++++ 16 files changed, 106 insertions(+) create mode 100644 suites/multi-version/dumpling-x/basic/% create mode 100644 suites/multi-version/dumpling-x/basic/0-cluster/start.yaml create mode 100644 suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml create mode 100644 suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml create mode 100644 suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml create mode 100644 suites/multi-version/dumpling-x/basic/2-workload/rados_loadgen_big.yaml create mode 100644 suites/multi-version/dumpling-x/basic/2-workload/rados_snap_many_objects.yaml create mode 100644 suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml create mode 100644 suites/multi-version/dumpling-x/basic/2-workload/rgw_s3tests.yaml create mode 100644 suites/multi-version/firefly-x/basic/% create mode 100644 suites/multi-version/firefly-x/basic/0-cluster/start.yaml create mode 100644 suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml create mode 100644 suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml create mode 100644 suites/multi-version/firefly-x/basic/2-workload/rados_snap_many_objects.yaml create mode 100644 suites/multi-version/firefly-x/basic/2-workload/rbd_cli_import_export.yaml create mode 100644 suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml diff --git a/suites/multi-version/dumpling-x/basic/% b/suites/multi-version/dumpling-x/basic/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml b/suites/multi-version/dumpling-x/basic/0-cluster/start.yaml new file mode 100644 index 0000000000000..01747e4205612 --- /dev/null +++ b/suites/multi-version/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/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml new file mode 100644 index 0000000000000..3a49f2f886475 --- /dev/null +++ b/suites/multi-version/dumpling-x/basic/1-install/dumpling-firefly.yaml @@ -0,0 +1,7 @@ +tasks: +- install: + branch: dumpling +- install.upgrade: + client.0: + branch: firefly +- ceph: diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml new file mode 100644 index 0000000000000..4e3b0795f0eb3 --- /dev/null +++ b/suites/multi-version/dumpling-x/basic/1-install/dumpling-master.yaml @@ -0,0 +1,7 @@ +tasks: +- install: + branch: dumpling +- install.upgrade: + client.0: + branch: master +- ceph: diff --git a/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml b/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml new file mode 100644 index 0000000000000..55700e533167d --- /dev/null +++ b/suites/multi-version/dumpling-x/basic/1-install/dumpling-next.yaml @@ -0,0 +1,7 @@ +tasks: +- install: + branch: dumpling +- install.upgrade: + client.0: + branch: next +- 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 new file mode 100644 index 0000000000000..b0030093e7219 --- /dev/null +++ b/suites/multi-version/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/multi-version/dumpling-x/basic/2-workload/rados_snap_many_objects.yaml b/suites/multi-version/dumpling-x/basic/2-workload/rados_snap_many_objects.yaml new file mode 100644 index 0000000000000..9e311c946e1a4 --- /dev/null +++ b/suites/multi-version/dumpling-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/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml b/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml new file mode 100644 index 0000000000000..de1d9b9be319b --- /dev/null +++ b/suites/multi-version/dumpling-x/basic/2-workload/rbd_cls.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + client.0: + - cls/test_cls_rbd.sh diff --git a/suites/multi-version/dumpling-x/basic/2-workload/rgw_s3tests.yaml b/suites/multi-version/dumpling-x/basic/2-workload/rgw_s3tests.yaml new file mode 100644 index 0000000000000..7e6440140019c --- /dev/null +++ b/suites/multi-version/dumpling-x/basic/2-workload/rgw_s3tests.yaml @@ -0,0 +1,5 @@ +tasks: +- rgw: [client.0] +- s3tests: + client.0: + rgw_server: client.0 diff --git a/suites/multi-version/firefly-x/basic/% b/suites/multi-version/firefly-x/basic/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/multi-version/firefly-x/basic/0-cluster/start.yaml b/suites/multi-version/firefly-x/basic/0-cluster/start.yaml new file mode 100644 index 0000000000000..01747e4205612 --- /dev/null +++ b/suites/multi-version/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/multi-version/firefly-x/basic/1-install/firefly-master.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml new file mode 100644 index 0000000000000..c7b199ba6b2d1 --- /dev/null +++ b/suites/multi-version/firefly-x/basic/1-install/firefly-master.yaml @@ -0,0 +1,7 @@ +tasks: +- install: + branch: firefly +- install.upgrade: + client.0: + branch: master +- ceph: diff --git a/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml b/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml new file mode 100644 index 0000000000000..572b1c41bc31c --- /dev/null +++ b/suites/multi-version/firefly-x/basic/1-install/firefly-next.yaml @@ -0,0 +1,7 @@ +tasks: +- install: + branch: firefly +- install.upgrade: + client.0: + branch: next +- 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 new file mode 100644 index 0000000000000..9e311c946e1a4 --- /dev/null +++ b/suites/multi-version/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/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 new file mode 100644 index 0000000000000..49070827be09b --- /dev/null +++ b/suites/multi-version/firefly-x/basic/2-workload/rbd_cli_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/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml b/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml new file mode 100644 index 0000000000000..4e82f5d462e04 --- /dev/null +++ b/suites/multi-version/firefly-x/basic/2-workload/rgw_swift.yaml @@ -0,0 +1,5 @@ +tasks: +- rgw: [client.0] +- swift: + client.0: + rgw_server: client.0 -- 2.39.5