From c0ef358ef950a720b215442af20f8bfb4df71053 Mon Sep 17 00:00:00 2001 From: Kautilya Tripathi Date: Tue, 19 Aug 2025 11:26:11 +0530 Subject: [PATCH] qa/tests: run full librbd test suite unconditionally Previously the librbd test runner listed individual gtest filters to work around unstable groups (see tracker #58791). Those workarounds are no longer needed, so the script has been simplified to invoke `ceph_test_librbd` directly. This ensures the entire suite is always executed and reduces maintenance overhead. Fixes: https://tracker.ceph.com/issues/58791 Co-authored-by: Matan Breizman Signed-off-by: Kautilya Tripathi --- .../rbd/tasks/rbd_api_tests.yaml | 2 +- .../rbd/tasks/rbd_api_tests_old_format.yaml | 2 +- .../rbd/crimson/test_crimson_librbd.sh | 35 ------------------- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100755 qa/workunits/rbd/crimson/test_crimson_librbd.sh diff --git a/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests.yaml b/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests.yaml index b0d019bbea3..099085a87aa 100644 --- a/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests.yaml +++ b/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests.yaml @@ -15,7 +15,7 @@ tasks: - workunit: clients: client.0: - - rbd/crimson/test_crimson_librbd.sh + - rbd/test_librbd.sh env: RBD_FEATURES: "61" diff --git a/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests_old_format.yaml b/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests_old_format.yaml index a6b85f7b3ce..3dbb69df40f 100644 --- a/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests_old_format.yaml +++ b/qa/suites/crimson-rados/rbd/tasks/rbd_api_tests_old_format.yaml @@ -10,4 +10,4 @@ tasks: - workunit: clients: client.0: - - rbd/crimson/test_crimson_librbd.sh + - rbd/test_librbd.sh diff --git a/qa/workunits/rbd/crimson/test_crimson_librbd.sh b/qa/workunits/rbd/crimson/test_crimson_librbd.sh deleted file mode 100755 index fb308de41f7..00000000000 --- a/qa/workunits/rbd/crimson/test_crimson_librbd.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -e - -if [ -n "${VALGRIND}" ]; then - valgrind ${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \ - --error-exitcode=1 ceph_test_librbd -else - # Run test cases indivually to allow better selection - # of ongoing Crimson development. - # Disabled test groups are tracked here: - # https://tracker.ceph.com/issues/58791 - ceph_test_librbd --gtest_filter='TestLibRBD.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/0.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/1.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/2.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/3.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/4.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/5.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/6.*' - ceph_test_librbd --gtest_filter='EncryptedFlattenTest/7.*' - # ceph_test_librbd --gtest_filter='DiffIterateTest/0.*' - # ceph_test_librbd --gtest_filter='DiffIterateTest/1.*' - ceph_test_librbd --gtest_filter='TestImageWatcher.*' - ceph_test_librbd --gtest_filter='TestInternal.*' - ceph_test_librbd --gtest_filter='TestMirroring.*' - # ceph_test_librbd --gtest_filter='TestDeepCopy.*' - ceph_test_librbd --gtest_filter='TestGroup.*' - # ceph_test_librbd --gtest_filter='TestMigration.*' - ceph_test_librbd --gtest_filter='TestMirroringWatcher.*' - ceph_test_librbd --gtest_filter='TestObjectMap.*' - ceph_test_librbd --gtest_filter='TestOperations.*' - ceph_test_librbd --gtest_filter='TestTrash.*' - ceph_test_librbd --gtest_filter='TestJournalEntries.*' - ceph_test_librbd --gtest_filter='TestJournalReplay.*' -fi -exit 0 -- 2.47.3