From: Yuri Weinstein Date: Mon, 9 Oct 2017 19:51:59 +0000 (-0700) Subject: tests - Added yaml fragmet to cover testing on standanone client.4 X-Git-Tag: v12.2.2~161^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18200%2Fhead;p=ceph.git tests - Added yaml fragmet to cover testing on standanone client.4 for http://tracker.ceph.com/issues/21660#note-17 Signed-off-by: Yuri Weinstein --- diff --git a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml index 0dc9dd2bc3d..f5a883a3927 100644 --- a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml @@ -18,6 +18,7 @@ roles: - client.1 - client.2 - client.3 +- - client.4 overrides: ceph: log-whitelist: diff --git a/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml b/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml deleted file mode 120000 index 5c72153e1f4..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../releases/luminous-with-mgr.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml b/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml new file mode 100644 index 00000000000..80c2b9dbd19 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml @@ -0,0 +1,4 @@ +tasks: +- exec: + osd.0: + - ceph osd require-osd-release luminous diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/+ b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/+ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/blogbench.yaml deleted file mode 100644 index d2629c03f68..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/blogbench.yaml +++ /dev/null @@ -1,13 +0,0 @@ -meta: -- desc: | - run a cephfs stress test - mount ceph-fuse on client.3 before running workunit -tasks: -- sequential: - - ceph-fuse: - - print: "**** done ceph-fuse 5-final-workload" - - workunit: - clients: - client.3: - - suites/blogbench.sh - - print: "**** done suites/blogbench.sh 5-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index d8b3dcb3869..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados-snaps-few-objects.yaml +++ /dev/null @@ -1,17 +0,0 @@ -meta: -- desc: | - randomized correctness test for rados operations on a replicated pool with snapshots -tasks: - - rados: - clients: [client.1] - ops: 4000 - objects: 50 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - - print: "**** done rados 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index 922a9da4f5b..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_loadgenmix.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: | - generate read/write load with rados objects ranging from 1 byte to 1MB -tasks: - - workunit: - clients: - client.1: - - rados/load-gen-mix.sh - - print: "**** done rados/load-gen-mix.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index ab6276ed45a..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,18 +0,0 @@ -meta: -- desc: | - librados C and C++ api tests -overrides: - ceph: - log-whitelist: - - reached quota -tasks: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - print: "**** done mon_thrash 4-final-workload" - - workunit: - branch: kraken - clients: - client.1: - - rados/test.sh - - print: "**** done rados/test.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_cls.yaml deleted file mode 100644 index aaf0a377999..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_cls.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: | - rbd object class functional tests -tasks: - - workunit: - clients: - client.1: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_import_export.yaml deleted file mode 100644 index 46e13550687..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_import_export.yaml +++ /dev/null @@ -1,11 +0,0 @@ -meta: -- desc: | - run basic import/export cli tests for rbd -tasks: - - workunit: - clients: - client.1: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format - - print: "**** done rbd/import_export.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml deleted file mode 100644 index 7a7659ff4f1..00000000000 --- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,13 +0,0 @@ -meta: -- desc: | - swift api tests for rgw -overrides: - rgw: - frontend: civetweb -tasks: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - - swift: - client.1: - rgw_server: client.1 - - print: "**** done swift 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/5-workload.yaml b/qa/suites/upgrade/kraken-x/parallel/5-workload.yaml new file mode 100644 index 00000000000..851c5c8cb2d --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/5-workload.yaml @@ -0,0 +1,11 @@ +meta: +- desc: | + run basic import/export cli tests for rbd on not upgrated client.4 + (covers issue http://tracker.ceph.com/issues/21660) +tasks: + - workunit: + branch: kraken + clients: + client.4: + - rbd/import_export.sh + - print: "**** done rbd/import_export.sh 5-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/6-luminous-with-mgr.yaml b/qa/suites/upgrade/kraken-x/parallel/6-luminous-with-mgr.yaml new file mode 120000 index 00000000000..5c72153e1f4 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/6-luminous-with-mgr.yaml @@ -0,0 +1 @@ +../../../../releases/luminous-with-mgr.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/+ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/blogbench.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/blogbench.yaml new file mode 100644 index 00000000000..d2629c03f68 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/blogbench.yaml @@ -0,0 +1,13 @@ +meta: +- desc: | + run a cephfs stress test + mount ceph-fuse on client.3 before running workunit +tasks: +- sequential: + - ceph-fuse: + - print: "**** done ceph-fuse 5-final-workload" + - workunit: + clients: + client.3: + - suites/blogbench.sh + - print: "**** done suites/blogbench.sh 5-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados-snaps-few-objects.yaml new file mode 100644 index 00000000000..d8b3dcb3869 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados-snaps-few-objects.yaml @@ -0,0 +1,17 @@ +meta: +- desc: | + randomized correctness test for rados operations on a replicated pool with snapshots +tasks: + - rados: + clients: [client.1] + ops: 4000 + objects: 50 + write_append_excl: false + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 + - print: "**** done rados 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_loadgenmix.yaml new file mode 100644 index 00000000000..922a9da4f5b --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_loadgenmix.yaml @@ -0,0 +1,9 @@ +meta: +- desc: | + generate read/write load with rados objects ranging from 1 byte to 1MB +tasks: + - workunit: + clients: + client.1: + - rados/load-gen-mix.sh + - print: "**** done rados/load-gen-mix.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_mon_thrash.yaml new file mode 100644 index 00000000000..ab6276ed45a --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_mon_thrash.yaml @@ -0,0 +1,18 @@ +meta: +- desc: | + librados C and C++ api tests +overrides: + ceph: + log-whitelist: + - reached quota +tasks: + - mon_thrash: + revive_delay: 20 + thrash_delay: 1 + - print: "**** done mon_thrash 4-final-workload" + - workunit: + branch: kraken + clients: + client.1: + - rados/test.sh + - print: "**** done rados/test.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_cls.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_cls.yaml new file mode 100644 index 00000000000..aaf0a377999 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_cls.yaml @@ -0,0 +1,9 @@ +meta: +- desc: | + rbd object class functional tests +tasks: + - workunit: + clients: + client.1: + - cls/test_cls_rbd.sh + - print: "**** done cls/test_cls_rbd.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_import_export.yaml new file mode 100644 index 00000000000..46e13550687 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_import_export.yaml @@ -0,0 +1,11 @@ +meta: +- desc: | + run basic import/export cli tests for rbd +tasks: + - workunit: + clients: + client.1: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format + - print: "**** done rbd/import_export.sh 4-final-workload" diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml new file mode 100644 index 00000000000..7a7659ff4f1 --- /dev/null +++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml @@ -0,0 +1,13 @@ +meta: +- desc: | + swift api tests for rgw +overrides: + rgw: + frontend: civetweb +tasks: + - rgw: [client.1] + - print: "**** done rgw 4-final-workload" + - swift: + client.1: + rgw_server: client.1 + - print: "**** done swift 4-final-workload"