From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 22 Jan 2026 10:00:25 +0000 (+0200)
Subject: container/build.sh: Use dedicated debug tags
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F67041%2Fhead;p=ceph.git

container/build.sh: Use dedicated debug tags

https://github.com/ceph/ceph-build/pull/2497 introduced a debug flavor.
This seems to cause conflicts with the image being pushed to quay as one
of the flavors might override the other.

Tag debug build containers explicitly.
Alternative solution would be to skip debug containers all together.
However. these might be useful for development purposes.

Note, prune-quay might also need to be updated once this is merged.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/container/build.sh b/container/build.sh
index d8a4cc99310..438926054d2 100755
--- a/container/build.sh
+++ b/container/build.sh
@@ -163,10 +163,16 @@ repopath=${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/${CONTAINER_R
 if [[ ${CI_CONTAINER} == "true" ]] ; then
     # ceph-ci conventions for remote tags:
     # requires ARCH, BRANCH, CEPH_SHA1, FLAVOR
-    full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel
-    branch_repo_tag=${repopath}:${BRANCH}
-    sha1_repo_tag=${repopath}:${CEPH_SHA1}
-
+    if [[ ${FLAVOR} == "debug" ]]; then
+        # add -debug suffix to flavor debug builds
+        full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel-${FLAVOR}
+        branch_repo_tag=${repopath}:${BRANCH}-${FLAVOR}
+        sha1_repo_tag=${repopath}:${CEPH_SHA1}-${FLAVOR}
+    else
+        full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel
+        branch_repo_tag=${repopath}:${BRANCH}
+        sha1_repo_tag=${repopath}:${CEPH_SHA1}
+    fi
     # while we have more than just centos9 containers:
     # anything that's not gets suffixed with its fromtag
     # for the branch and sha1 tags (for example, <branch>-rocky-10).