From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 5 Nov 2021 17:53:44 +0000 (-0400)
Subject: qa/upgrade: rgw multisite upgrade test excludes ceph-volume
X-Git-Tag: v17.1.0~403^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43824%2Fhead;p=ceph.git

qa/upgrade: rgw multisite upgrade test excludes ceph-volume

E: Unable to locate package ceph-volume

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/upgrade/octopus-x/rgw-multisite/tasks.yaml b/qa/suites/upgrade/octopus-x/rgw-multisite/tasks.yaml
index 0a0bac1a899..e688eff1da8 100644
--- a/qa/suites/upgrade/octopus-x/rgw-multisite/tasks.yaml
+++ b/qa/suites/upgrade/octopus-x/rgw-multisite/tasks.yaml
@@ -1,5 +1,7 @@
 tasks:
 - install:
+    exclude_packages:
+      - ceph-volume
 - ceph: {cluster: c1}
 - ceph: {cluster: c2}
 - parallel:
diff --git a/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/primary.yaml b/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/primary.yaml
index ef89e79916e..7a66f4ac05e 100644
--- a/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/primary.yaml
+++ b/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/primary.yaml
@@ -1,5 +1,7 @@
 upgrade-task:
 - install.upgrade: # leave c2 on octopus, upgrade c1 to current
+    exclude_packages:
+      - ceph-volume
     c1.mon.a:
     c1.mgr.x:
     c1.osd.0:
diff --git a/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/secondary.yaml b/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/secondary.yaml
index b93eb969ce3..ee36d4802fe 100644
--- a/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/secondary.yaml
+++ b/qa/suites/upgrade/octopus-x/rgw-multisite/upgrade/secondary.yaml
@@ -1,5 +1,7 @@
 upgrade-task:
 - install.upgrade: # leave c1 on octopus, upgrade c2 to current
+    exclude_packages:
+      - ceph-volume
     c2.mon.a:
     c2.mgr.x:
     c2.osd.0: