qa/tasks/rgw/upgrade: don't restart the entire cluster at once

and also whitelist 'wrongly marked me down'

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml b/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml
index fd200d752a26254989fa66298a68e4a5b86dbb80..2b61069026dae0da4f7261c1754478ef1e7ee014 100644 (file)
--- a/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml
+++ b/qa/suites/rgw/upgrade/ragweed/0-cluster/start.yaml
@@ -9,6 +9,8 @@ overrides:
       mon:
         mon warn on legacy crush tunables: false
     fs: xfs
+    log-whitelist:
+    - wrongly marked me down
 roles:
 - - mon.a
   - mon.b

diff --git a/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml b/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml
index 76a4d61fd10ab40a0f1bb7d89a6b623fb6221187..e7a23ca847ebbbc5c488e4407e543617ab8afade 100644 (file)
--- a/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml
+++ b/qa/suites/rgw/upgrade/ragweed/3-upgrade/upgrade.yaml
@@ -11,6 +11,14 @@ tasks:
     osd.5:
     client.0:
 - ceph.restart:
-    daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
+    daemons: [mon.a, mon.b, mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: false
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]
     wait-for-healthy: false
     wait-for-osds-up: true