]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #66069 into wip-pdonnell-testing-20260207.214551
authorPatrick Donnelly <pdonnell@ibm.com>
Sat, 7 Feb 2026 21:46:04 +0000 (16:46 -0500)
committerPatrick Donnelly <pdonnell@ibm.com>
Sat, 7 Feb 2026 21:46:04 +0000 (16:46 -0500)
* refs/pull/66069/head:
Containerfile: Support rocky/el10 in repo URLs

1  2 
container/Containerfile

index c0a0cbba73990a2e76c4a7b5a895f2c3803c1ebd,53a887f9104bb60c4a7d017f056e0b0f28969b12..e8b7bf1dfb930f19ce235fad453497eacdfcd894
@@@ -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 \