]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-perf: recognize Rocky/AlmaLinux in setup 2663/head
authorKautilya Tripathi <kautilya.tripathi@ibm.com>
Wed, 22 Jul 2026 03:44:21 +0000 (09:14 +0530)
committerKautilya Tripathi <kautilya.tripathi@ibm.com>
Wed, 22 Jul 2026 03:44:29 +0000 (09:14 +0530)
Performance nodes now run Rocky 10 (ID=rocky); the setup case only
handled centos|rhel and exited with "unknown distro". Treat rocky and
almalinux as EL-family, and make llvm/gcc-toolset steps best-effort so
Rocky 10 does not fail on missing EL8/9 modules.

Signed-off-by: Kautilya Tripathi <kautilya.tripathi@ibm.com>
ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml

index 76123e7722f5f1d2e508d2569c1e7414f2207a2b..a709780ee2cc4eb07b7435e1f6cf8c2aa6f19ca5 100644 (file)
           debian|ubuntu)
               sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3-yaml python3-lxml python3-prettytable python3-matplotlib cython3
               ;;
-          centos|rhel)
+          centos|rhel|rocky|almalinux)
+              # llvm/gcc-toolset are EL8/9-oriented; ignore on Rocky 10+ where modules differ.
               sudo dnf copr remove tchaikov/llvm-toolset-10 || true
-              sudo dnf module enable -y llvm-toolset
-              sudo dnf install -y llvm-toolset
-              sudo yum install -y python3-pyyaml python3-lxml python3-prettytable python3-matplotlib python3-Cython
-              sudo yum update -y libarchive
+              sudo dnf module enable -y llvm-toolset || true
+              sudo dnf install -y llvm-toolset || true
+              sudo dnf install -y python3-pyyaml python3-lxml python3-prettytable python3-matplotlib python3-Cython
+              sudo dnf update -y libarchive || true
               gcc_toolset_ver=13
               # so clang is able to find gcc-toolset-${{gcc_toolset_ver}} which is listed as a
               # BuildRequires in ceph.spec.in, and it is installed by `run-make.sh`.
               # clang searches for GCC in a bunch of well known places:
               # see https://github.com/llvm-mirror/clang/blob/main/lib/Driver/ToolChains/Gnu.cpp
-              sudo ln -sf /opt/rh/gcc-toolset-${{gcc_toolset_ver}}/root/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}} \
-                          /usr/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}}
+              if test -d /opt/rh/gcc-toolset-${{gcc_toolset_ver}}/root/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}} ; then
+                  sudo ln -sf /opt/rh/gcc-toolset-${{gcc_toolset_ver}}/root/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}} \
+                              /usr/lib/gcc/x86_64-redhat-linux/${{gcc_toolset_ver}}
+              fi
               ;;
           fedora)
               sudo yum install -y python3-pyyaml python3-lxml python3-prettytable python3-matplotlib python3-Cython clang