From 37ea1976b30e4e03ac535ee353c3a5277c53dbd3 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Tue, 10 Oct 2017 13:48:33 -0700 Subject: [PATCH] tests - Added yaml fragmet to cover testing... ... for http://tracker.ceph.com/issues/21660#note-17 for jewel-x (see similar https://github.com/ceph/ceph/pull/18200) Signed-off-by: Yuri Weinstein (cherry picked from commit b552e636ddd8ce2cfb605b4c124440d8dd1e8e47) Signed-off-by: Yuri Weinstein --- qa/releases/luminous-with-mgr.yaml | 1 - .../jewel-x/parallel/0-cluster/start.yaml | 1 + .../upgrade/jewel-x/parallel/4-luminous.yaml | 24 ++++++++++++++++++- .../upgrade/jewel-x/parallel/5-workload.yaml | 11 +++++++++ .../jewel-x/parallel/6-luminous-with-mgr.yaml | 1 + .../{5-final-workload => 7-final-workload}/+ | 0 .../blogbench.yaml | 2 +- .../rados-snaps-few-objects.yaml | 2 +- .../rados_loadgenmix.yaml | 2 +- .../rados_mon_thrash.yaml | 2 +- .../rbd_cls.yaml | 2 +- .../rbd_import_export.yaml | 2 +- .../rgw_swift.yaml | 4 ++-- 13 files changed, 44 insertions(+), 10 deletions(-) mode change 120000 => 100644 qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml create mode 100644 qa/suites/upgrade/jewel-x/parallel/5-workload.yaml create mode 120000 qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/+ (100%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/blogbench.yaml (81%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rados-snaps-few-objects.yaml (88%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rados_loadgenmix.yaml (74%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rados_mon_thrash.yaml (84%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rbd_cls.yaml (69%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rbd_import_export.yaml (76%) rename qa/suites/upgrade/jewel-x/parallel/{5-final-workload => 7-final-workload}/rgw_swift.yaml (64%) diff --git a/qa/releases/luminous-with-mgr.yaml b/qa/releases/luminous-with-mgr.yaml index ea3130768705e..d500803750ece 100644 --- a/qa/releases/luminous-with-mgr.yaml +++ b/qa/releases/luminous-with-mgr.yaml @@ -2,7 +2,6 @@ tasks: - exec: osd.0: - ceph osd require-osd-release luminous - - ceph osd set-require-min-compat-client luminous - ceph.healthy: overrides: ceph: diff --git a/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml index 3145626320cfa..d1f1e1070446a 100644 --- a/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/jewel-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/jewel-x/parallel/4-luminous.yaml b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml deleted file mode 120000 index 5283ac73e1b27..0000000000000 --- a/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../releases/luminous.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml new file mode 100644 index 0000000000000..e57b37753de0c --- /dev/null +++ b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml @@ -0,0 +1,23 @@ +# this is the same fragment as ../../../../releases/luminous.yaml +# but without line "ceph osd set-require-min-compat-client luminous" + +tasks: +- exec: + mgr.x: + - mkdir -p /var/lib/ceph/mgr/ceph-x + - ceph auth get-or-create-key mgr.x mon 'allow profile mgr' + - ceph auth export mgr.x > /var/lib/ceph/mgr/ceph-x/keyring +- ceph.restart: + daemons: [mgr.x] + wait-for-healthy: false +- exec: + osd.0: + - ceph osd require-osd-release luminous +- ceph.healthy: +overrides: + ceph: + conf: + mon: + mon warn on osd down out interval zero: false + log-whitelist: + - no active mgr diff --git a/qa/suites/upgrade/jewel-x/parallel/5-workload.yaml b/qa/suites/upgrade/jewel-x/parallel/5-workload.yaml new file mode 100644 index 0000000000000..f7e9de46ac73d --- /dev/null +++ b/qa/suites/upgrade/jewel-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: jewel + clients: + client.4: + - rbd/import_export.sh + - print: "**** done rbd/import_export.sh 5-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml b/qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml new file mode 120000 index 0000000000000..5c72153e1f4c1 --- /dev/null +++ b/qa/suites/upgrade/jewel-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/jewel-x/parallel/5-final-workload/+ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/+ similarity index 100% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/+ rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/+ diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml similarity index 81% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml index d2629c03f6865..b36ace1541d76 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml @@ -10,4 +10,4 @@ tasks: clients: client.3: - suites/blogbench.sh - - print: "**** done suites/blogbench.sh 5-final-workload" + - print: "**** done suites/blogbench.sh 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml similarity index 88% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml index d8b3dcb3869db..7dd61c5fcce5d 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml @@ -14,4 +14,4 @@ tasks: snap_create: 50 snap_remove: 50 rollback: 50 - - print: "**** done rados 4-final-workload" + - print: "**** done rados 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml similarity index 74% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml index 922a9da4f5bf7..b218b92268bdd 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml @@ -6,4 +6,4 @@ tasks: clients: client.1: - rados/load-gen-mix.sh - - print: "**** done rados/load-gen-mix.sh 4-final-workload" + - print: "**** done rados/load-gen-mix.sh 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml similarity index 84% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml index 9b60d2ebc3f76..c835a659b82a0 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml @@ -15,4 +15,4 @@ tasks: clients: client.1: - rados/test-upgrade-v11.0.0.sh - - print: "**** done rados/test-upgrade-v11.0.0.sh 4-final-workload" + - print: "**** done rados/test-upgrade-v11.0.0.sh 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml similarity index 69% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml index aaf0a377999f6..46bbf76106de5 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml @@ -6,4 +6,4 @@ tasks: clients: client.1: - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh 4-final-workload" + - print: "**** done cls/test_cls_rbd.sh 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml similarity index 76% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_import_export.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml index 46e1355068723..5ae749188ba9e 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_import_export.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml @@ -8,4 +8,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 7-final-workload" diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml similarity index 64% rename from qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml rename to qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml index 7a7659ff4f1c2..780c4ad706510 100644 --- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml @@ -6,8 +6,8 @@ overrides: frontend: civetweb tasks: - rgw: [client.1] - - print: "**** done rgw 4-final-workload" + - print: "**** done rgw 7-final-workload" - swift: client.1: rgw_server: client.1 - - print: "**** done swift 4-final-workload" + - print: "**** done swift 7-final-workload" -- 2.39.5