From: Samuel Just <sjust@redhat.com>
Date: Thu, 22 Jan 2026 21:30:16 +0000 (-0800)
Subject: Merge branch prs/66171
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b094b9be39a9c8d4d2007f90caad0f9c3f953fe0;p=ceph-ci.git

Merge branch prs/66171
---

b094b9be39a9c8d4d2007f90caad0f9c3f953fe0
diff --cc qa/tasks/cephadm.py
index 01a9ac11df6,3038e4db53c..14dd10aaad2
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@@ -1961,9 -1957,14 +1961,10 @@@ def task(ctx, config)
      ref = ctx.config.get("branch", "main")
      if not ctx.ceph[cluster_name].image:
          if not container_image_name:
 -            raise Exception("Configuration error occurred. "
 -                            "The 'image' value is undefined for 'cephadm' task. "
 -                            "Please provide corresponding options in the task's "
 -                            "config, task 'overrides', or teuthology 'defaults' "
 -                            "section.")
 +            container_image_name = 'quay.ceph.io/ceph-ci/ceph'
          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')