From: Xiubo Li <xiubli@redhat.com>
Date: Wed, 19 Oct 2022 01:40:57 +0000 (+0800)
Subject: qa/cephfs: fix confusing config when upgrading mds nodes
X-Git-Tag: v18.1.0~427^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59cd40d2b1ea561b388ea07bc400a9aa8416d13b;p=ceph.git

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 a4692c684d9b..26c185946dd6 100644
--- 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 a68c3d921f91..e5ea8b19cef3 100644
--- 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