From: Venky Shankar <vshankar@redhat.com>
Date: Thu, 13 Oct 2022 05:22:22 +0000 (-0400)
Subject: qa: fs:upgrade featureful_client test upgrades to quincy
X-Git-Tag: v18.1.0~996^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48485%2Fhead;p=ceph.git

qa: fs:upgrade featureful_client test upgrades to quincy

Reef cycle will not allow upgrades from octopus. However, the featureful
client tests still needs to be testes, therefore, upgrade to quincy (from
octopus) rather to the current cycle (reef).

Signed-off-by: Venky Shankar <vshankar@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 31d0ec3c07d0..a4692c684d9b 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
@@ -21,7 +21,9 @@ tasks:
 - print: "**** done mds pre-upgrade sequence"
 - install.upgrade:
     mon.a:
+      branch: quincy
     mon.b:
+      branch: quincy
 - print: "**** done install.upgrade both hosts"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
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 8529be3e6d91..a68c3d921f91 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
@@ -21,7 +21,9 @@ tasks:
 - print: "**** done mds pre-upgrade sequence"
 - install.upgrade:
     mon.a:
+      branch: quincy
     mon.b:
+      branch: quincy
 - print: "**** done install.upgrade both hosts"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
index 58fdfdbd8d9e..251c349acb82 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
@@ -1,6 +1,7 @@
 tasks:
 - install.upgrade:
     client.0:
+      branch: quincy
 - print: "**** done install.upgrade on client.0"
 - ceph-fuse:
     client.0: