From 99d6890d0fb75656a893c158abefc2f405da6135 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Tue, 23 Jul 2019 08:58:13 -0700 Subject: [PATCH] qa/tests: added rgw into upgrade sequence to improve coverage Signed-off-by: Yuri Weinstein --- .../nautilus-x/parallel/1-ceph-install/nautilus.yaml | 3 +++ .../nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml | 2 -- .../nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 2 +- .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 6 ++++++ .../upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml | 3 +-- 5 files changed, 11 insertions(+), 5 deletions(-) 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 2a3104cb8c0..0ed40672cb0 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 @@ -35,6 +35,9 @@ tasks: mon.b: mon.c: - print: "**** done install.upgrade non-client hosts" +- rgw: + - client.1 +- print: "**** done => started rgw client.1" - parallel: - workload - upgrade-sequence diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml index ab68649008b..7c8dd21a2a1 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml @@ -4,8 +4,6 @@ meta: workload: full_sequential: - sequential: - - rgw: - - client.1 - ragweed: client.1: default-branch: ceph-master diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 7fb9829a4a9..e8349b690ff 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -16,7 +16,7 @@ upgrade-sequence: wait-for-healthy: false wait-for-osds-up: true - ceph.restart: - daemons: [mds.a] + daemons: [mds.a, rgw.*] wait-for-healthy: false wait-for-osds-up: true - print: "**** done ceph.restart all" diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index 2d9349e050c..6f0b9ae7146 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -4,6 +4,7 @@ meta: upgrate in two steps step one ordering: mon.a, osd.0, osd.1, mds.a step two ordering: mon.b, mon.c, osd.2, osd.3 + step three ordering: client.1 ceph expected to be healthy state after each step upgrade-sequence: sequential: @@ -45,3 +46,8 @@ upgrade-sequence: wait-for-healthy: true - sleep: duration: 60 + - ceph.restart: + daemons: [rgw.*] + wait-for-healthy: true + - sleep: + duration: 60 diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml index 00855dc5606..de959947290 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml @@ -3,6 +3,5 @@ overrides: frontend: civetweb tasks: - sequential: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - rgw-final-workload + - print: "**** done rgw 4-final-workload" -- 2.39.5