From 2b7bd94f139251b4373a9662e5add86456566486 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 11 Oct 2017 13:12:45 -0700 Subject: [PATCH] tests - Added yaml fragmet to cover testing... ... for http://tracker.ceph.com/issues/21660#note-17 for luminous-x (see similar #18200, #18226) Signed-off-by: Yuri Weinstein (cherry picked from commit e7fdda31803cd37604a9296a876320bfcb849d34) Signed-off-by: Yuri Weinstein --- .../luminous-x/parallel/0-cluster/start.yaml | 1 + .../rbd_import_export_no_upgrated.yaml | 13 +++++++++++++ ..._export.yaml => rbd_import_export_upgrated.yaml} | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml rename qa/suites/upgrade/luminous-x/parallel/5-final-workload/{rbd_import_export.yaml => rbd_import_export_upgrated.yaml} (65%) diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml index 1e8d5a58ddfcb..3684b1e0a0af7 100644 --- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/luminous-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/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml new file mode 100644 index 0000000000000..5de8a23615ba3 --- /dev/null +++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml @@ -0,0 +1,13 @@ +meta: +- desc: | + run basic import/export cli tests for rbd + on NO upgrated client +tasks: + - workunit: + branch: luminous + clients: + client.4: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format + - print: "**** done rbd/import_export.sh 4-final-workload on NO upgrated client" 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_upgrated.yaml similarity index 65% rename from qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml rename to qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_upgrated.yaml index 46e1355068723..2c7c484e114a1 100644 --- 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_upgrated.yaml @@ -1,6 +1,7 @@ meta: - desc: | run basic import/export cli tests for rbd + on upgrated client tasks: - workunit: clients: @@ -8,4 +9,4 @@ tasks: - rbd/import_export.sh env: RBD_CREATE_ARGS: --new-format - - print: "**** done rbd/import_export.sh 4-final-workload" + - print: "**** done rbd/import_export.sh 4-final-workload on upgrated client" -- 2.39.5