]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildcontainer-setup.sh: allow testing with various ELish bases 64781/head
authorJohn Mulligan <jmulligan@redhat.com>
Mon, 16 Jun 2025 18:38:00 +0000 (14:38 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Thu, 31 Jul 2025 16:18:49 +0000 (12:18 -0400)
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)

src/script/buildcontainer-setup.sh

index c263ef44a79a0758507e53093c23cf36c07c9ba2..9964ed3241d56ac97887def8d4a7f3d620142c0c 100644 (file)
@@ -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