]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
container/build.sh: fix debug tag overwrite 68303/head
authorShraddha Agrawal <shraddha.agrawal000@gmail.com>
Fri, 10 Apr 2026 08:40:55 +0000 (14:10 +0530)
committerShraddha Agrawal <shraddha.agrawal000@gmail.com>
Fri, 10 Apr 2026 08:40:55 +0000 (14:10 +0530)
This commit fixes an issue when the image is not the base distro,
the debug suffix for it is overwritten. This is especially
required for crimson debug builds to work for rocky10.

Fixes: https://tracker.ceph.com/issues/75952
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
container/build.sh

index 60c502c9ea5e2504395eb9944d36f9e2061ede4f..51ffcce81f3296104682691e297165bad1ebc66e 100755 (executable)
@@ -217,6 +217,10 @@ if [[ ${CI_CONTAINER} == "true" ]] ; then
     if [[ "${fromtag}" != "${default_fromtag}" ]] ; then
         branch_repo_tag=${repopath}:${BRANCH}-${fromtag}
         sha1_repo_tag=${repopath}:${CEPH_SHA1}-${fromtag}
+        if [[ ${FLAVOR} == "debug" ]]; then
+            branch_repo_tag=${branch_repo_tag}-${FLAVOR}
+            sha1_repo_tag=${sha1_repo_tag}-${FLAVOR}
+        fi
     fi
 
     if [[ "${ARCH}" == "arm64" ]] ; then