From: John Mulligan <jmulligan@redhat.com>
Date: Mon, 16 Jun 2025 18:38:00 +0000 (-0400)
Subject: buildcontainer-setup.sh: allow testing with various ELish bases
X-Git-Tag: v20.1.1~140^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac104ae711f4eedcf03cc45795616b63fe329807;p=ceph.git

buildcontainer-setup.sh: allow testing with various ELish bases

Allow testing with more RPM-based/EL style distros.
Simplify the centos selection as centos8 ought to always
be matched by the earlier block.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7975c52e81bb3062831615be9d0ce94e2b074281)
(cherry picked from commit cd6dd2ccda005e9ab4d45eb930883d512f95418e)
---

diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh
index c263ef44a79a0..9964ed3241d56 100644
--- a/src/script/buildcontainer-setup.sh
+++ b/src/script/buildcontainer-setup.sh
@@ -36,7 +36,8 @@ case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in
         install_container_deps
         dnf_clean
     ;;
-    *~*centos*9|*~*centos*10*|*~fedora*)
+    # EL-ish, 9+
+    *~*centos*|*~fedora*|*~rocky*|*~alma*)
         dnf install -y /usr/bin/{rpmbuild,wget,curl}
         install_container_deps
         dnf_clean