From 147e2fca08d86fccb4df503dae853ecc04f5d99c Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 12 Jun 2025 08:32:35 +0000 Subject: [PATCH] qa/tasks: update crimson flavor types Signed-off-by: Matan Breizman (cherry picked from commit 83d556b85d90c0f717e260a00f43fcffe168dc19) --- qa/tasks/ceph.py | 3 ++- qa/tasks/cephadm.py | 2 +- qa/tasks/rook.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index af55c9a1b2b..819154c98db 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -666,7 +666,8 @@ def create_simple_monmap(ctx, remote, conf, mons, def is_crimson(config): - return config.get('flavor', 'default') == 'crimson' + return config.get('flavor', 'default') == 'crimson-debug' or \ + config.get('flavor', 'default') == 'crimson-release' def maybe_redirect_stderr(config, type_, args, log_path): diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index daf26c61721..f64744dabf7 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -2352,7 +2352,7 @@ def task(ctx, config): flavor = config.get('flavor', 'default') if sha1: - if flavor == "crimson": + if flavor == "crimson-debug" or flavor == "crimson-release": ctx.ceph[cluster_name].image = container_image_name + ':' + sha1 + '-' + flavor else: ctx.ceph[cluster_name].image = container_image_name + ':' + sha1 diff --git a/qa/tasks/rook.py b/qa/tasks/rook.py index fae5ef3bf00..6bcd8efa46a 100644 --- a/qa/tasks/rook.py +++ b/qa/tasks/rook.py @@ -626,7 +626,7 @@ def task(ctx, config): sha1 = config.get('sha1') flavor = config.get('flavor', 'default') if sha1: - if flavor == "crimson": + if flavor == "crimson-debug" or flavor == "crimson-release": ctx.rook[cluster_name].image = container_image_name + ':' + sha1 + '-' + flavor else: ctx.rook[cluster_name].image = container_image_name + ':' + sha1 -- 2.47.3