From: Neha Ojha <nojha@redhat.com>
Date: Thu, 22 Apr 2021 20:39:48 +0000 (+0000)
Subject: qa/suites/upgrade/pacific-x/rgw-multisite: fix install version
X-Git-Tag: v17.1.0~2160^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=839ce6de151893c0c8d0c9a62ebceaab5d0940d5;p=ceph.git

qa/suites/upgrade/pacific-x/rgw-multisite: fix install version

Before:

2021-04-22T06:20:58.260 INFO:teuthology.task.install:Ceph rpm upgrade from
16.2.1-103.gb54cefd0.el8 to 16.2.1-103.gb54cefd0

After:

2021-04-22T21:08:16.565 INFO:teuthology.task.install:Ceph rpm upgrade from
16.2.1-105.g540c2494.el8 to 17.0.0-3515.ga5b16446

Fixes: https://tracker.ceph.com/issues/50388
Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
index b298e9d4a1a1a..35ef026d61865 100644
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
@@ -18,9 +18,6 @@ overrides:
         rgw sync obj etag verify: true
   rgw:
     compression type: random
-  install:
-    ceph:
-      branch: pacific
   rgw-multisite-tests:
     branch: pacific # run pacific branch of tests
     repo: https://github.com/ceph/ceph.git
diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
index 0a0bac1a899e3..843858543ed80 100644
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
@@ -1,5 +1,6 @@
 tasks:
 - install:
+    branch: pacific
 - ceph: {cluster: c1}
 - ceph: {cluster: c2}
 - parallel: