From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 12 Jun 2025 08:32:35 +0000 (+0000)
Subject: qa/tasks: update crimson flavor types
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=83d556b85d90c0f717e260a00f43fcffe168dc19;p=ceph.git

qa/tasks: update crimson flavor types

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index af55c9a1b2bc9..819154c98db87 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 daf26c617219f..f64744dabf77f 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 fae5ef3bf0056..6bcd8efa46ac6 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