Skip to content

Commit 525afef

Browse files
committed
container/build.sh: Use dedicated debug tags
ceph/ceph-build#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>
1 parent da9b2f1 commit 525afef

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

container/build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,16 @@ repopath=${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/${CONTAINER_R
163163
if [[ ${CI_CONTAINER} == "true" ]] ; then
164164
# ceph-ci conventions for remote tags:
165165
# requires ARCH, BRANCH, CEPH_SHA1, FLAVOR
166-
full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel
167-
branch_repo_tag=${repopath}:${BRANCH}
168-
sha1_repo_tag=${repopath}:${CEPH_SHA1}
169-
166+
if [[ ${FLAVOR} == "debug" ]]; then
167+
# add -debug suffix to flavor debug builds
168+
full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel-${FLAVOR}
169+
branch_repo_tag=${repopath}:${BRANCH}-${FLAVOR}
170+
sha1_repo_tag=${repopath}:${CEPH_SHA1}-${FLAVOR}
171+
else
172+
full_repo_tag=${repopath}:${BRANCH}-${fromtag}-${ARCH}-devel
173+
branch_repo_tag=${repopath}:${BRANCH}
174+
sha1_repo_tag=${repopath}:${CEPH_SHA1}
175+
fi
170176
# while we have more than just centos9 containers:
171177
# anything that's not gets suffixed with its fromtag
172178
# for the branch and sha1 tags (for example, <branch>-rocky-10).

0 commit comments

Comments
 (0)