From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Mon, 6 Jul 2020 10:49:28 +0000 (+0530)
Subject: docker/podman: tag crimson flavor container as 'sha-1-flavor'
X-Git-Tag: v15.2.5~136^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e7b21f7d5b44d37dbc8ad47eb9595fe6408c56c;p=ceph.git

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 a5065ba3ee1f..29c1e97b7078 100644
--- 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?