From: Patrick Donnelly <pdonnell@ibm.com>
Date: Thu, 5 Feb 2026 01:56:00 +0000 (-0500)
Subject: Merge PR #66069 into wip-pdonnell-testing-20260205.015545
X-Git-Tag: testing/wip-pdonnell-testing-20260205.015545~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15941ab31c1d5ad974fa4f6a99c4e204dd4a5967;p=ceph-ci.git

Merge PR #66069 into wip-pdonnell-testing-20260205.015545

* refs/pull/66069/head:
	Containerfile: Support rocky/el10 in repo URLs
---

15941ab31c1d5ad974fa4f6a99c4e204dd4a5967
diff --cc container/Containerfile
index c0a0cbba739,53a887f9104..e8b7bf1dfb9
--- a/container/Containerfile
+++ b/container/Containerfile
@@@ -150,8 -179,19 +179,14 @@@ libradosstriper1 
  rbd-mirror" \
  >> packages.txt
  
 -# Optional crimson package(s)
 -RUN if [[ "${OSD_FLAVOR}" == "crimson-debug" || "${OSD_FLAVOR}" == "crimson-release" ]]; then \
 -    echo "ceph-crimson-osd" >> packages.txt ; \
 -fi
 -
  # Ceph "Recommends"
- RUN echo "nvme-cli python3-saml smartmontools" >> packages.txt
+ RUN set -euo pipefail; \
+     echo "nvme-cli smartmontools" >> packages.txt; \
+     source /etc/ceph-distro.env; \
+     if [ "$MAJOR" -le 9 ]; then \
+         echo "python3-saml" >> packages.txt; \
+     fi
+ 
  # NFS-Ganesha
  RUN echo "\
  dbus-daemon \