From: Nathan Cutler Date: Sat, 21 Jul 2018 18:22:08 +0000 (+0200) Subject: tests: upgrade/luminous-x: fix order of final-workload directory X-Git-Tag: v14.0.1~744^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4432b16673a99b19655677ed4c98c8b81766738e;p=ceph.git tests: upgrade/luminous-x: fix order of final-workload directory This is just a cosmetic fix. Signed-off-by: Nathan Cutler --- diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml new file mode 100644 index 000000000000..205f72e832bc --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-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 4-final-workload" + - workunit: + clients: + client.3: + - suites/blogbench.sh + - print: "**** done suites/blogbench.sh 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml new file mode 100644 index 000000000000..d8b3dcb3869d --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-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/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml new file mode 100644 index 000000000000..922a9da4f5bf --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-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/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml new file mode 100644 index 000000000000..98f051d31ab7 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml @@ -0,0 +1,19 @@ +meta: +- desc: | + librados C and C++ api tests +overrides: + ceph: + log-whitelist: + - reached quota + - \(REQUEST_SLOW\) +tasks: + - mon_thrash: + revive_delay: 20 + thrash_delay: 1 + - print: "**** done mon_thrash 4-final-workload" + - workunit: + branch: luminous + clients: + client.1: + - rados/test.sh + - print: "**** done rados/test.sh 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml new file mode 100644 index 000000000000..aaf0a377999f --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-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/luminous-x/parallel/4-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml new file mode 100644 index 000000000000..46e135506872 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-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/luminous-x/parallel/4-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml new file mode 100644 index 000000000000..00855dc5606e --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml @@ -0,0 +1,8 @@ +overrides: + rgw: + frontend: civetweb +tasks: + - sequential: + - rgw: [client.1] + - print: "**** done rgw 4-final-workload" + - rgw-final-workload diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml new file mode 100644 index 000000000000..72233b2edf6f --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml @@ -0,0 +1,11 @@ +meta: +- desc: | + ragweed check for rgw +rgw-final-workload: + full_sequential: + - ragweed: + client.1: + force-branch: ceph-master + rgw_server: client.1 + stages: check + - print: "**** done ragweed check 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml new file mode 100644 index 000000000000..45c136fa8f79 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml @@ -0,0 +1,10 @@ +meta: +- desc: | + swift api tests for rgw +rgw-final-workload: + full_sequential: + - swift: + client.1: + force-branch: ceph-master + rgw_server: client.1 + - print: "**** done swift 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml deleted file mode 100644 index d2629c03f686..000000000000 --- a/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml deleted file mode 100644 index d8b3dcb3869d..000000000000 --- a/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml deleted file mode 100644 index 922a9da4f5bf..000000000000 --- a/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml deleted file mode 100644 index 98f051d31ab7..000000000000 --- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml +++ /dev/null @@ -1,19 +0,0 @@ -meta: -- desc: | - librados C and C++ api tests -overrides: - ceph: - log-whitelist: - - reached quota - - \(REQUEST_SLOW\) -tasks: - - mon_thrash: - revive_delay: 20 - thrash_delay: 1 - - print: "**** done mon_thrash 4-final-workload" - - workunit: - branch: luminous - clients: - client.1: - - rados/test.sh - - print: "**** done rados/test.sh 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml deleted file mode 100644 index aaf0a377999f..000000000000 --- a/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml deleted file mode 100644 index 46e135506872..000000000000 --- a/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml deleted file mode 100644 index 00855dc5606e..000000000000 --- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml +++ /dev/null @@ -1,8 +0,0 @@ -overrides: - rgw: - frontend: civetweb -tasks: - - sequential: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - - rgw-final-workload diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml deleted file mode 100644 index 72233b2edf6f..000000000000 --- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml +++ /dev/null @@ -1,11 +0,0 @@ -meta: -- desc: | - ragweed check for rgw -rgw-final-workload: - full_sequential: - - ragweed: - client.1: - force-branch: ceph-master - rgw_server: client.1 - stages: check - - print: "**** done ragweed check 4-final-workload" diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml deleted file mode 100644 index 45c136fa8f79..000000000000 --- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml +++ /dev/null @@ -1,10 +0,0 @@ -meta: -- desc: | - swift api tests for rgw -rgw-final-workload: - full_sequential: - - swift: - client.1: - force-branch: ceph-master - rgw_server: client.1 - - print: "**** done swift 4-final-workload"