container: update crimson flavors

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/container/Containerfile b/container/Containerfile
index de4a82cac38460558f34a8b9d388830ac35ca556..7eb9592365115230366c835c8622cd210db74b60 100644 (file)
--- 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 00c37682b967d3f0e1e6a89caf7284edf2e014bc..ca0a5604d82b203ebce7c516b3c11cee7bdce0cb 100755 (executable)
--- 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