Skip to content

Commit

Permalink
contrib: add extra identifier tag to c8 containers instead of c9
Browse files Browse the repository at this point in the history
In response to c8 going EOL (https://lists.ceph.io/hyperkitty/list/[email protected]/thread/H7I4Q4RAIT6UZQNPPZ5O3YB6AUXLLAFI/),
we will need to have the orch and upgrade suites run with c9 containers instead of c8.

Signed-off-by: Laura Flores <[email protected]>
  • Loading branch information
Laura Flores authored and dmick committed May 30, 2024
1 parent fe3baff commit 985bb83
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions contrib/build-push-ceph-container-imgs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,14 @@ function push_ceph_imgs_latest {
full_repo_tag=${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/ceph:${RELEASE}-${distro}-stream${distro_release}-${HOST_ARCH}-devel
branch_repo_tag=${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/ceph:${BRANCH}
sha1_repo_tag=${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/ceph:${SHA1}
# for centos9, while we're still building centos8, add -centos9 to branch and sha1 tags
# to avoid colliding with the existing distrover-less tags for the c8 containers
if [[ ${distro_release} == "9" ]] ; then
branch_repo_tag=${branch_repo_tag}-centos9
sha1_repo_tag=${sha1_repo_tag}-centos9
# Now that centos8 will be going EOL, we need to make centos9 default. While we're still building
# centos8, add -centos8 to branch and sha1 tags to avoid colliding with the distrover-less tags
# for the c9 containers.
# TODO: Once c8 builds start failing and/or we remove them, any references to c8 in this file
# will likely become dead code which should be cleaned up.
if [[ ${distro_release} == "8" ]] ; then
branch_repo_tag=${branch_repo_tag}-centos8
sha1_repo_tag=${sha1_repo_tag}-centos8
fi
# add aarch64 suffix for short tags to allow coexisting arches
if [[ ${HOST_ARCH} == "aarch64" ]] ; then
Expand Down

0 comments on commit 985bb83

Please sign in to comment.