docker/podman: tag crimson flavor container as 'sha-1-flavor'

see also: ceph/ceph-container#1704

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit b0a14d6e1eb194fe654fe160430d953a96a7e355)

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index a5065ba3ee1fcb231d23fe990d8f474240d2ab7a..29c1e97b707844f709061dae744aa048cab37737 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1162,8 +1162,13 @@ def task(ctx, config):
     ref = None
     if not ctx.ceph[cluster_name].image:
         sha1 = config.get('sha1')
+        flavor = config.get('flavor', 'default')
+
         if sha1:
-            ctx.ceph[cluster_name].image = container_image_name + ':' + sha1
+            if flavor == "crimson":
+                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1 + '-' + flavor
+            else:
+                ctx.ceph[cluster_name].image = container_image_name + ':' + sha1
             ref = sha1
         else:
             # hmm, fall back to branch?