From f1e378aeaf05c8602faf82541ce8f474b48121d0 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 8 Sep 2023 13:52:34 +0200 Subject: [PATCH] qa/suites/upgrade/quincy-p2p: skip TestClsRbd.mirror_snapshot test The behavior of the class method changed in reef; the change was backported to pacific and quincy. An older quincy binary used against newer quincy OSDs produces an expected failure: [ RUN ] TestClsRbd.mirror_snapshot .../ceph-17.2.0/src/test/cls_rbd/test_cls_rbd.cc:2278: Failure Expected equality of these values: -85 mirror_image_snapshot_unlink_peer(&ioctx, oid, 1, "peer2") Which is: 0 [ FAILED ] TestClsRbd.mirror_snapshot (49 ms) TestClsRbd.snapshots_namespaces test was removed in commit 4ad9d565a15c ("librbd: simplified retrieving snapshots from image header") many years ago. Fixes: https://tracker.ceph.com/issues/62773 Signed-off-by: Ilya Dryomov --- .../quincy-p2p/quincy-p2p-parallel/point-to-point-upgrade.yaml | 2 +- .../quincy-p2p/quincy-p2p-stress-split/4-workload/rbd-cls.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/suites/upgrade/quincy-p2p/quincy-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/quincy-p2p/quincy-p2p-parallel/point-to-point-upgrade.yaml index 160f1cd624b52..558735533cbdb 100644 --- a/qa/suites/upgrade/quincy-p2p/quincy-p2p-parallel/point-to-point-upgrade.yaml +++ b/qa/suites/upgrade/quincy-p2p/quincy-p2p-parallel/point-to-point-upgrade.yaml @@ -124,7 +124,7 @@ workload_quincy: - rados/test.sh - cls env: - CLS_RBD_GTEST_FILTER: '*:-TestClsRbd.snapshots_namespaces' + CLS_RBD_GTEST_FILTER: '*:-TestClsRbd.mirror_snapshot' - print: "**** done rados/test.sh & cls workload_quincy" - sequential: - rgw: [client.0] diff --git a/qa/suites/upgrade/quincy-p2p/quincy-p2p-stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/quincy-p2p/quincy-p2p-stress-split/4-workload/rbd-cls.yaml index 3d01d37aeed45..4674dc6da38ed 100644 --- a/qa/suites/upgrade/quincy-p2p/quincy-p2p-stress-split/4-workload/rbd-cls.yaml +++ b/qa/suites/upgrade/quincy-p2p/quincy-p2p-stress-split/4-workload/rbd-cls.yaml @@ -7,4 +7,6 @@ stress-tasks: clients: client.0: - cls/test_cls_rbd.sh + env: + CLS_RBD_GTEST_FILTER: '*:-TestClsRbd.mirror_snapshot' - print: "**** done cls/test_cls_rbd.sh 4-workload" -- 2.39.5