From 0f6b30d60061a974cc9b20b2e52ee53664a5631b Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 8 Jul 2019 12:51:51 -0700 Subject: [PATCH] qa/tests: added ragweed coverage to stress-split* upgrade suites added ceph config set global bluestore_warn_on_legacy_statfs fals changed user "foo" to "ragweed" in ragweed.py Fixes: http://tracker.ceph.com/issues/40452 Fices: http://tracker.ceph.com/issues/40467 Signed-off-by: Yuri Weinstein --- .../parallel/1-ceph-install/nautilus.yaml | 1 + .../stress-split/1-ceph-install/nautilus.yaml | 3 +++ .../4-workload/rgw_ragweed_prepare.yaml | 14 ++++++++++++++ .../rgw-swift-ragweed_check.yaml | 18 ++++++++++++++++++ .../7-final-workload/rgw-swift.yaml | 11 ----------- qa/tasks/ragweed.py | 2 +- 6 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml create mode 100644 qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml delete mode 100644 qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml index d208a9d3b9c37..2a3104cb8c092 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml @@ -25,6 +25,7 @@ tasks: conf: global: mon warn on pool no app: false + bluestore_warn_on_legacy_statfs: false - exec: osd.0: - ceph osd set-require-min-compat-client nautilus diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml index 059642500c58e..5bcb3eaed6e0a 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml @@ -5,6 +5,9 @@ tasks: branch: nautilus - print: "**** done install nautilus" - ceph: + conf: + global: + bluestore_warn_on_legacy_statfs: false - exec: osd.0: - ceph osd require-osd-release nautilus diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml new file mode 100644 index 0000000000000..b1f06bcc96251 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml @@ -0,0 +1,14 @@ +meta: +- desc: | + rgw ragweed prepare before upgrade +stress-tasks: + - full_sequential: + - sequential: + - rgw: + - client.0 + - ragweed: + client.0: + default-branch: ceph-nautilus + rgw_server: client.0 + stages: prepare + - print: "**** done rgw ragweed prepare 4-workload" diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml new file mode 100644 index 0000000000000..39734ef8571b6 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml @@ -0,0 +1,18 @@ +meta: +- desc: | + swift api tests for rgw + rgw ragweed check after upgrade +tasks: +- rgw: + client.0: +- print: "**** done rgw 7-workload" +- swift: + client.0: + rgw_server: client.0 +- print: "**** done swift 7-workload" +- ragweed: + client.0: + default-branch: ceph-nautilus + rgw_server: client.0 + stages: check +- print: "**** done rgw ragweed check 7-workload" diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml deleted file mode 100644 index 76e5d6fc23158..0000000000000 --- a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml +++ /dev/null @@ -1,11 +0,0 @@ -meta: -- desc: | - swift api tests for rgw -tasks: -- rgw: - client.0: -- print: "**** done rgw 9-workload" -- swift: - client.0: - rgw_server: client.0 -- print: "**** done swift 9-workload" diff --git a/qa/tasks/ragweed.py b/qa/tasks/ragweed.py index 24b53999ffb04..b3bcf1f92e50d 100644 --- a/qa/tasks/ragweed.py +++ b/qa/tasks/ragweed.py @@ -119,7 +119,7 @@ def create_users(ctx, config, run_stages): log.info('Creating rgw users...') testdir = teuthology.get_testdir(ctx) - users = {'user regular': 'foo', 'user system': 'sysuser'} + users = {'user regular': 'ragweed', 'user system': 'sysuser'} for client in config['clients']: if not 'prepare' in run_stages[client]: # should have been prepared in a previous run -- 2.39.5