From b0a14d6e1eb194fe654fe160430d953a96a7e355 Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Mon, 6 Jul 2020 16:19:28 +0530 Subject: [PATCH] docker/podman: tag crimson flavor container as 'sha-1-flavor' see also: ceph/ceph-container#1704 Signed-off-by: Deepika Upadhyay --- qa/tasks/cephadm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index cb873aaccc4..228fc744914 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -1156,8 +1156,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? -- 2.39.5