From: Patrick Donnelly <pdonnell@ibm.com>
Date: Sat, 9 May 2026 00:00:46 +0000 (-0400)
Subject: Merge PR #67895 into tentacle
X-Git-Tag: v20.2.2~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd795dd04e332e823cb0d25068be92422f0c1d27;p=ceph.git

Merge PR #67895 into tentacle

* refs/pull/67895/head:
	container/build.sh: add 'rocky-10' suffix if necessary

Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
---

fd795dd04e332e823cb0d25068be92422f0c1d27
diff --cc container/build.sh
index 438926054d2,20e49c7b392..9c39c3e1b7e
--- a/container/build.sh
+++ b/container/build.sh
@@@ -163,21 -162,15 +163,31 @@@ repopath=${CONTAINER_REPO_HOSTNAME}/${C
  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).
 +    # The default can change when it needs to.
 +
++    if [[ "${fromtag}" != "centos-stream9" ]] ; then
++        branch_repo_tag=${repopath}:${BRANCH}-${fromtag}
++        sha1_repo_tag=${repopath}:${CEPH_SHA1}-${fromtag}
++    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).
+     # The default can change when it needs to.
+ 
      if [[ "${fromtag}" != "centos-stream9" ]] ; then
          branch_repo_tag=${repopath}:${BRANCH}-${fromtag}
          sha1_repo_tag=${repopath}:${CEPH_SHA1}-${fromtag}