From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Apr 2019 21:39:58 +0000 (-0500)
Subject: qa/suites/upgrade/mimic-x-singleton: upgrade mgrs later
X-Git-Tag: v15.0.0~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2436eadcfdd3bc6469818db38ec22108b32f0725;p=ceph.git

qa/suites/upgrade/mimic-x-singleton: upgrade mgrs later

The mgrmap may change when the mons upgrade, causing the mgr daemons to
respawn.  Delay the upgrade until later so that the ondisk binary does
not change out from underneath them.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml
index 3c65ea9ccc5d..c154444bafa4 100644
--- a/qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/0-cluster/start.yaml
@@ -17,7 +17,6 @@ overrides:
         debug mds: 20
 roles:
 - - mon.a
-  - mgr.x
   - mds.a
   - osd.0
   - osd.1
@@ -29,6 +28,7 @@ roles:
   - osd.6
   - osd.7
 - - mon.c
+  - mgr.x
   - mgr.y
   - osd.8
   - osd.9