From: Samuel Just Date: Fri, 7 Nov 2025 01:33:54 +0000 (+0000) Subject: qa/tasks/cephadm: add support for distro-suffix X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e47e09c1289c9ac3073bbe1844794419eb314c9;p=ceph.git qa/tasks/cephadm: add support for distro-suffix Signed-off-by: Samuel Just --- diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 5d48c904e61..3038e4db53c 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -1964,19 +1964,20 @@ def task(ctx, config): "section.") sha1 = config.get('sha1') flavor = config.get('flavor', 'default') + distro_suffix = config.get('distro-suffix', None) if any(_ in container_image_name for _ in (':', '@')): log.info('Provided image contains tag or digest, using it as is') ctx.ceph[cluster_name].image = container_image_name - elif sha1: - 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 - ref = sha1 else: - # fall back to using the branch value + if sha1: + ref = sha1 ctx.ceph[cluster_name].image = container_image_name + ':' + ref + + if distro_suffix is not None: + ctx.ceph[cluster_name].image += '-' + distro_suffix + if flavor == "crimson-debug" or flavor == "crimson-release": + ctx.ceph[cluster_name].image += '-' + flavor log.info('Cluster image is %s' % ctx.ceph[cluster_name].image)