bump version to 12.2.4-pve1

[ceph.git] / ceph / qa / suites / upgrade / jewel-x / point-to-point-x / point-to-point-upgrade.yaml

diff --git a/ceph/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/ceph/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index fd4a1d8f6b7b431a8795d7e491ad9ff35f1dcd3f..d68c258c027f21d5e0151a73df5d4bbf98ccd11a 100644 (file)
--- a/ceph/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/ceph/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -16,12 +16,20 @@ overrides:
     - scrub
     - osd_map_max_advance
     - wrongly marked
+    - overall HEALTH_
+    - \(MGR_DOWN\)
+    - \(OSD_
+    - \(PG_
+    - \(CACHE_
     fs: xfs
     conf:
+      global:
+        mon warn on pool no app: false
       mon:
         mon debug unsafe allow tier with nonempty snaps: true
       osd:
         osd map max advance: 1000
+        osd map cache size: 1100
 roles:
 - - mon.a
   - mds.a
@@ -49,6 +57,7 @@ tasks:
 - ceph:
    fs: xfs
    skip_mgr_daemons: true
+   add_osds_to_crush: true
 - print: "**** done ceph xfs"
 - sequential:
    - workload
@@ -79,6 +88,9 @@ tasks:
    - workload_x
    - upgrade-sequence_x
 - print: "**** done parallel -x branch"
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client luminous
 # Run librados tests on the -x upgraded cluster
 - install.upgrade:
     client.1:
@@ -156,7 +168,7 @@ workload_x:
        branch: jewel
        clients:
          client.1:
-         - rados/test-upgrade-v11.0.0.sh
+         - rados/test-upgrade-v11.0.0-noec.sh
          - cls
        env:
          CLS_RBD_GTEST_FILTER: '*:-TestClsRbd.mirror_image'
@@ -165,7 +177,7 @@ workload_x:
        branch: jewel
        clients:
          client.0:
-         - rados/test-upgrade-v11.0.0.sh
+         - rados/test-upgrade-v11.0.0-noec.sh
          - cls
    - print: "**** done rados/test-upgrade-v11.0.0.sh &  cls workload_x upgraded client"
    - rgw: [client.1]
@@ -220,6 +232,5 @@ upgrade-sequence_x:
    - exec:
        osd.0:
          - ceph osd require-osd-release luminous
-         - ceph osd set-require-min-compat-client luminous
    - ceph.healthy:
    - print: "**** done ceph.restart all -x branch mds/osd/mon"