From c3df2070039f962b324053ff0588a755597443ab Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 24 Jul 2019 09:20:50 -0700 Subject: [PATCH] qa/tests: added rgw into upgrade sequence to improve coverage - splits Signed-off-by: Yuri Weinstein --- .../nautilus-x/stress-split/1-ceph-install/nautilus.yaml | 3 +++ .../stress-split/4-workload/rgw_ragweed_prepare.yaml | 2 -- .../upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml | 3 ++- .../stress-split/7-final-workload/rgw-swift-ragweed_check.yaml | 3 --- 4 files changed, 5 insertions(+), 6 deletions(-) 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 5bcb3eaed6e..b1d523f5396 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 @@ -13,6 +13,9 @@ tasks: - ceph osd require-osd-release nautilus - ceph osd set-require-min-compat-client nautilus - print: "**** done ceph" +- rgw: + - client.0 +- print: "**** done => started rgw client.0" overrides: ceph: conf: 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 index b1f06bcc962..8adde7ef570 100644 --- 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 @@ -4,8 +4,6 @@ meta: stress-tasks: - full_sequential: - sequential: - - rgw: - - client.0 - ragweed: client.0: default-branch: ceph-nautilus diff --git a/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml index 306445c8fbf..6061fbe4c65 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml @@ -3,9 +3,10 @@ tasks: osd.8: client.0: - ceph.restart: - daemons: [mon.c, osd.8, osd.9, osd.10, osd.11] + daemons: [mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*] wait-for-healthy: false wait-for-osds-up: true +- print: "**** restarted/upgrated => mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*" - exec: osd.0: - ceph osd set pglog_hardlimit 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 index 39734ef8571..734a5f494a0 100644 --- 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 @@ -3,9 +3,6 @@ meta: 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 -- 2.39.5