From 6519c96af76433aa0ed1003325164d37988b36b9 Mon Sep 17 00:00:00 2001 From: Jose J Palacios-Perez Date: Mon, 9 Mar 2026 16:50:15 +0000 Subject: [PATCH] qa/workunits: add crimson/ and move test_crimson_dump_metrics.sh. Edit osd-dump-metrics.yaml accordingly Signed-off-by: Jose J Palacios-Perez --- qa/suites/crimson-rados/singleton/all/osd-dump-metrics.yaml | 2 +- .../{cephtool => crimson}/test_crimson_dump_metrics.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) rename qa/workunits/{cephtool => crimson}/test_crimson_dump_metrics.sh (89%) diff --git a/qa/suites/crimson-rados/singleton/all/osd-dump-metrics.yaml b/qa/suites/crimson-rados/singleton/all/osd-dump-metrics.yaml index e22c901606c2..7c0fc68f12b6 100644 --- a/qa/suites/crimson-rados/singleton/all/osd-dump-metrics.yaml +++ b/qa/suites/crimson-rados/singleton/all/osd-dump-metrics.yaml @@ -27,4 +27,4 @@ tasks: - workunit: clients: client.0: - - cephtool/test_crimson_dump_metrics.sh + - crimson/test_crimson_dump_metrics.sh diff --git a/qa/workunits/cephtool/test_crimson_dump_metrics.sh b/qa/workunits/crimson/test_crimson_dump_metrics.sh similarity index 89% rename from qa/workunits/cephtool/test_crimson_dump_metrics.sh rename to qa/workunits/crimson/test_crimson_dump_metrics.sh index 10b373a6f1eb..923083e062f1 100755 --- a/qa/workunits/cephtool/test_crimson_dump_metrics.sh +++ b/qa/workunits/crimson/test_crimson_dump_metrics.sh @@ -5,6 +5,9 @@ set -x function test_dump_metrics() { + # Skip this test unless the osd_type is crimson: + [ "$(ceph osd metadata 0 | jq -r '.osd_type')" == "crimson" ] || return 0 + # Ensure can get dump_metrics full ceph tell osd.0 dump_metrics 2>/dev/null > /tmp/dump_metrics_full.json || true -- 2.47.3