qa/cephfs: fix confusing config when upgrading mds nodes

Both these two cephfs tests are using 1-mds-2-client-micro.yaml:
roles:
- [mon.a, mon.b, mon.c, mgr.x, mgr.y, mds.a, mds.b, mds.c, osd.0, osd.1, osd.2, osd.3]
- [client.0]
- [client.1]

So all the mon/mgr/mds/osd daemons are running in the first single
node. It makes no sense to upgrade the same node twice.

Signed-off-by: Xiubo Li <xiubli@redhat.com>

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index a4692c684d9b3a7e4f0b62355ec960af9e8e1800..26c185946dd6843ded0d07639a34c1090a830f8c 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -20,11 +20,10 @@ tasks:
 - mds_pre_upgrade:
 - print: "**** done mds pre-upgrade sequence"
 - install.upgrade:
+    # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
     mon.a:
       branch: quincy
-    mon.b:
-      branch: quincy
-- print: "**** done install.upgrade both hosts"
+- print: "**** done install.upgrade the host"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
     mon-health-to-clog: false

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index a68c3d921f91b2ff87174c25a86c3e833eabb349..e5ea8b19cef368a046d74e724046fa1fc01a3e13 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -20,11 +20,10 @@ tasks:
 - mds_pre_upgrade:
 - print: "**** done mds pre-upgrade sequence"
 - install.upgrade:
+    # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
     mon.a:
       branch: quincy
-    mon.b:
-      branch: quincy
-- print: "**** done install.upgrade both hosts"
+- print: "**** done install.upgrade the host"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
     mon-health-to-clog: false