From e194cca29c44bfc347d458aabbbb9f4c74461c04 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 16 Nov 2025 13:12:26 +0000 Subject: [PATCH] qa/tasks/ceph.py: introduce crimson_compat In an attempt to use the default flavor for both crimson and classic, we can no longer rely on flavors to enable crimson flags. The existing CRIMSON_COMPAT env variable is defined under "workunit", and is not supported by tasks/ceph. Instead, introduce, a dedicated crimson_compat option supported by tasks/ceph. Signed-off-by: Matan Breizman --- qa/config/crimson_qa_overrides.yaml | 1 + qa/tasks/ceph.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/config/crimson_qa_overrides.yaml b/qa/config/crimson_qa_overrides.yaml index ce2a0aeeb9d..c0edf21f15e 100644 --- a/qa/config/crimson_qa_overrides.yaml +++ b/qa/config/crimson_qa_overrides.yaml @@ -12,6 +12,7 @@ overrides: debug ms: 20 seastore cachepin size pershard: 64M seastore max concurrent transactions: 8 + crimson_compat: true workunit: env: CRIMSON_COMPAT: '1' diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 1c14194703b..d4801c9b4ed 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -667,9 +667,7 @@ def create_simple_monmap(ctx, remote, conf, mons, def is_crimson(config): - return config.get('flavor', 'default') == 'crimson-debug' or \ - config.get('flavor', 'default') == 'crimson-release' - + return config.get('crimson_compat', False) def maybe_redirect_stderr(config, type_, args, log_path): if type_ == 'osd' and is_crimson(config): -- 2.39.5