From 27fc12bfa04db1c56d078ad40108edde9fa210d9 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 4 Dec 2024 12:59:07 +0100 Subject: [PATCH] qa/suites/upgrade/*-x: skip TestClsRbd.group_snap_{set,remove} These tests assert on the number of keys on the group header object, which changed with commits ec6224db3e55 ("cls/rbd: save group snapshot creation order in a new key") and 3662bc7b3dc3 ("cls/rbd: save max group snap order"). Fixes: https://tracker.ceph.com/issues/67759 Signed-off-by: Ilya Dryomov --- qa/suites/upgrade/quincy-x/parallel/workload/rados_api.yaml | 2 ++ .../quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml | 2 ++ .../upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml | 2 ++ qa/suites/upgrade/reef-x/parallel/workload/rados_api.yaml | 2 ++ .../upgrade/reef-x/stress-split/2-first-half-tasks/rbd-cls.yaml | 2 ++ .../upgrade/reef-x/stress-split/3-stress-tasks/rbd-cls.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/qa/suites/upgrade/quincy-x/parallel/workload/rados_api.yaml b/qa/suites/upgrade/quincy-x/parallel/workload/rados_api.yaml index 9c2ff9da185ee..9a0585cc07469 100644 --- a/qa/suites/upgrade/quincy-x/parallel/workload/rados_api.yaml +++ b/qa/suites/upgrade/quincy-x/parallel/workload/rados_api.yaml @@ -9,4 +9,6 @@ workload: clients: client.0: - cls + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done end rados_api.yaml" diff --git a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml index b722f18736183..a55dddf46f721 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml @@ -7,4 +7,6 @@ first-half-tasks: clients: client.0: - cls/test_cls_rbd.sh + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml index 649b024a476e5..d54ba8039d087 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml @@ -7,4 +7,6 @@ stress-tasks: clients: client.0: - cls/test_cls_rbd.sh + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/qa/suites/upgrade/reef-x/parallel/workload/rados_api.yaml b/qa/suites/upgrade/reef-x/parallel/workload/rados_api.yaml index a46e34db5dd95..79cf1a96601ae 100644 --- a/qa/suites/upgrade/reef-x/parallel/workload/rados_api.yaml +++ b/qa/suites/upgrade/reef-x/parallel/workload/rados_api.yaml @@ -9,4 +9,6 @@ workload: clients: client.0: - cls + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done end rados_api.yaml" diff --git a/qa/suites/upgrade/reef-x/stress-split/2-first-half-tasks/rbd-cls.yaml b/qa/suites/upgrade/reef-x/stress-split/2-first-half-tasks/rbd-cls.yaml index f092096f444dd..79ad2af8ea14a 100644 --- a/qa/suites/upgrade/reef-x/stress-split/2-first-half-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/reef-x/stress-split/2-first-half-tasks/rbd-cls.yaml @@ -7,4 +7,6 @@ first-half-tasks: clients: client.0: - cls/test_cls_rbd.sh + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/qa/suites/upgrade/reef-x/stress-split/3-stress-tasks/rbd-cls.yaml b/qa/suites/upgrade/reef-x/stress-split/3-stress-tasks/rbd-cls.yaml index 05bb672b3ac79..166327a58f9ed 100644 --- a/qa/suites/upgrade/reef-x/stress-split/3-stress-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/reef-x/stress-split/3-stress-tasks/rbd-cls.yaml @@ -7,4 +7,6 @@ stress-tasks: clients: client.0: - cls/test_cls_rbd.sh + env: + CLS_RBD_GTEST_FILTER: '-TestClsRbd.group_snap_set:TestClsRbd.group_snap_remove' - print: "**** done cls/test_cls_rbd.sh 5-workload" -- 2.39.5