From c0a1168ec2bacf6d78041f3ae49bfe6fff669913 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 9 Oct 2017 12:51:59 -0700 Subject: [PATCH] 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 --- .../upgrade/kraken-x/parallel/0-cluster/start.yaml | 1 + qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml | 4 ++++ qa/suites/upgrade/kraken-x/parallel/5-workload.yaml | 11 +++++++++++ ...uminous-with-mgr.yaml => 6-luminous-with-mgr.yaml} | 0 .../parallel/{5-final-workload => 7-final-workload}/+ | 0 .../blogbench.yaml | 0 .../rados-snaps-few-objects.yaml | 0 .../rados_loadgenmix.yaml | 0 .../rados_mon_thrash.yaml | 0 .../rbd_cls.yaml | 0 .../rbd_import_export.yaml | 0 .../rgw_swift.yaml | 0 12 files changed, 16 insertions(+) create mode 100644 qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml create mode 100644 qa/suites/upgrade/kraken-x/parallel/5-workload.yaml rename qa/suites/upgrade/kraken-x/parallel/{4-luminous-with-mgr.yaml => 6-luminous-with-mgr.yaml} (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/+ (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/blogbench.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rados-snaps-few-objects.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rados_loadgenmix.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rados_mon_thrash.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rbd_cls.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rbd_import_export.yaml (100%) rename qa/suites/upgrade/kraken-x/parallel/{5-final-workload => 7-final-workload}/rgw_swift.yaml (100%) 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 0dc9dd2bc3d82..f5a883a3927df 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.yaml b/qa/suites/upgrade/kraken-x/parallel/4-luminous.yaml new file mode 100644 index 0000000000000..80c2b9dbd1966 --- /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-workload.yaml b/qa/suites/upgrade/kraken-x/parallel/5-workload.yaml new file mode 100644 index 0000000000000..851c5c8cb2de6 --- /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/4-luminous-with-mgr.yaml b/qa/suites/upgrade/kraken-x/parallel/6-luminous-with-mgr.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/4-luminous-with-mgr.yaml rename to qa/suites/upgrade/kraken-x/parallel/6-luminous-with-mgr.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/+ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/+ similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/+ rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/+ diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/blogbench.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/blogbench.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/blogbench.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados-snaps-few-objects.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados-snaps-few-objects.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados-snaps-few-objects.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_loadgenmix.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_loadgenmix.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_loadgenmix.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_mon_thrash.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rados_mon_thrash.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rados_mon_thrash.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_cls.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_cls.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_cls.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_import_export.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rbd_import_export.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rbd_import_export.yaml diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml similarity index 100% rename from qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml rename to qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml -- 2.39.5