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 af55c9a1b2bc96da10d7fd0552649f741f8be9cb..819154c98db87307881c0f1e3781925e12ce184e 100644 (file)
--- 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 daf26c617219fa464cfae36aa3a9af4e1a6c35fc..f64744dabf77f34a41e693a338e97196f43856b9 100644 (file)
--- 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 fae5ef3bf00562c00eb81820438fd473a7f087d9..6bcd8efa46ac6a208ab84c3a7bd4809d06b55666 100644 (file)
--- 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