From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 12 Jun 2025 08:29:29 +0000 (+0000)
Subject: container: update crimson flavors
X-Git-Tag: testing/wip-vshankar-testing-20250623.033253-tentacle-debug~19^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=22858cd5d554b7c7f7e3b14df066155c756fefb2;p=ceph-ci.git

container: update crimson flavors

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 425b6dac14d9494d8de96ca7231d0a5fb77d319c)
---

diff --git a/container/Containerfile b/container/Containerfile
index de4a82cac38..7eb95923651 100644
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -144,7 +144,7 @@ rbd-mirror" \
 >> packages.txt
 
 # Optional crimson package(s)
-RUN if [ "${OSD_FLAVOR}" == "crimson" ]; then \
+RUN if [[ "${OSD_FLAVOR}" == "crimson-debug" || "${OSD_FLAVOR}" == "crimson-release" ]]; then \
     echo "ceph-crimson-osd" >> packages.txt ; \
 fi
 
diff --git a/container/build.sh b/container/build.sh
index 00c37682b96..ca0a5604d82 100755
--- a/container/build.sh
+++ b/container/build.sh
@@ -174,7 +174,7 @@ if [[ ${CI_CONTAINER} == "true" ]] ; then
     podman tag ${image_id} ${branch_repo_tag}
     podman tag ${image_id} ${sha1_repo_tag}
 
-    if [[ ${FLAVOR} == "crimson" && ${ARCH} == "x86_64" ]] ; then
+    if [[ (${FLAVOR} == "crimson-debug" || ${FLAVOR} == "crimson-release") && ${ARCH} == "x86_64" ]] ; then
         sha1_flavor_repo_tag=${sha1_repo_tag}-${FLAVOR}
         podman tag ${image_id} ${sha1_flavor_repo_tag}
         if [[ -z "${NO_PUSH}" ]] ; then