From: Kefu Chai <kchai@redhat.com>
Date: Thu, 20 Aug 2020 03:19:27 +0000 (+0800)
Subject: ceph-perf-pull-requests: enable llvm-toolset-10 repo for clang-10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1644%2Fhead;p=ceph-build.git

ceph-perf-pull-requests: enable llvm-toolset-10 repo for clang-10

we need clang for detecting build failures with this compiler, and for
performing static analysis.

recently, seastar started to require better C++17 compatible compiler,
and it dropped the support of C++14. so before llvm-toolset-10 is added
to RHEL8/CentOS8, we need to use our own copr repo for clang-10.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
index 916ee107..ffb69aea 100644
--- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
+++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
@@ -58,7 +58,7 @@
           export FOR_MAKE_CHECK=true
           cxx_compiler=g++
           c_compiler=gcc
-          for i in $(seq 11 -1 8); do
+          for i in $(seq 11 -1 10); do
               if type -t clang-$i > /dev/null; then
                   cxx_compiler="clang++-$i"
                   c_compiler="clang-$i"
@@ -169,9 +169,23 @@
           fi
           case $ID in
           debian|ubuntu)
-              sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3-yaml python3-lxml python3-prettytable ${{extra_pkgs}};;
-          centos|fedora|rhel)
+              sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3-yaml python3-lxml python3-prettytable ${{extra_pkgs}}
+              ;;
+          centos|rhel)
+              sudo dnf module disable -y llvm-toolset
+              sudo dnf copr enable -y tchaikov/llvm-toolset-10 centos-stream-x86_64
               sudo yum install -y python3-pyyaml python3-lxml python3-prettytable ${{extra_pkgs}};;
+              gcc_toolset_ver=9
+              # 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/master/lib/Driver/ToolChains/Gnu.cpp
+              sudo ln -s /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}}
+              ;;
+          fedora)
+              sudo yum install -y python3-pyyaml python3-lxml python3-prettytable ${{extra_pkgs}}
+              ;;
           *)
               echo "unknown distro: $ID"
               exit 1