From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 25 Jun 2020 07:55:51 +0000 (+0200)
Subject: qa/cephadm/upgrade: Exclude RGW for now
X-Git-Tag: v15.2.4~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=575b566863e4b827594b3b079c800624ece9dbcd;p=ceph.git

qa/cephadm/upgrade: Exclude RGW for now

tasks/cephadm.py gained RGW support very recently and
I'm now facing a dilemman:

* Either we set the upgrade start to 15.2.4 and thus
  no longer upgrade from an old version, or
* Disable RGW upgrade for now.

I think doing both would be optinal, but for now, let's
disable RGW, in order to keep the coverage for everything
else.

Fixes: https://tracker.ceph.com/issues/46157

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4c5b20f9168d2d7ea40f48702f1bc9fb999bbce3)
---

diff --git a/qa/suites/rados/cephadm/upgrade/fixed-2.yaml b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
deleted file mode 120000
index 5c3e0593cbc9..000000000000
--- a/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../smoke/fixed-2.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/cephadm/upgrade/fixed-2.yaml b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
new file mode 100644
index 000000000000..8c79ebe96bf6
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
@@ -0,0 +1,31 @@
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+#   - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true