]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/suites/rados/cephadm/upgrade: start at 15.2.9 to test iscsi upgrade 40034/head
authorSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 03:58:33 +0000 (22:58 -0500)
committerSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 21:13:46 +0000 (16:13 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml [new file with mode: 0644]
qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
qa/suites/rados/cephadm/upgrade/fixed-2.yaml [deleted file]

diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml
new file mode 100644 (file)
index 0000000..3aa6037
--- /dev/null
@@ -0,0 +1,34 @@
+os_type: ubuntu
+os_version: "20.04"
+
+tasks:
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.9
+    cephadm_branch: v15.2.9
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+#  - ceph.rgw.realm.zone.a  # CLI change in v16 pacific
+  - 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
+  - ceph.iscsi.iscsi.a
index f9bd987926710d7ee460451391d96260e1b889d6..b26227dc88b1d274c276e0e9a943d0210302c2c9 100644 (file)
@@ -8,3 +8,27 @@ tasks:
     cephadm_git_url: https://github.com/ceph/ceph
     # avoid --cap-add=PTRACE + --privileged for older cephadm versions
     allow_ptrace: false
+
+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
+#  - ceph.iscsi.iscsi.a  # needs later start point
diff --git a/qa/suites/rados/cephadm/upgrade/fixed-2.yaml b/qa/suites/rados/cephadm/upgrade/fixed-2.yaml
deleted file mode 100644 (file)
index a0ec7a1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-  - ceph.iscsi.iscsi.a
-openstack:
-- volumes: # attached to each instance
-    count: 4
-    size: 10 # GB
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true