ceph-perf-pull-requests: use llvm-toolset from AppStream

now that AppStream includes llvm-toolset-13, there is no need to
use a copr repo for llvm-toolset-10.

also update the compiler detection algorithm to be more future-proof.

see also 342bd7ec05bc4b83212cb53e48b04b607bb2be04

Signed-off-by: Kefu Chai <tchaikov@gmail.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 8706c0baf867598e7a1ccd03157e9f54dd2731ac..7cc438ed48c540971501156de4db0774811f81d7 100644 (file)
--- 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 10); do
+          for i in $(seq 15 -1 10); do
               if type -t clang-$i > /dev/null; then
                   cxx_compiler="clang++-$i"
                   c_compiler="clang-$i"
@@ -169,9 +169,10 @@
               sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3-yaml python3-lxml python3-prettytable clang-10
               ;;
           centos|rhel)
-              sudo dnf module disable -y llvm-toolset
-              sudo dnf copr enable -y tchaikov/llvm-toolset-10 centos-stream-8-x86_64
-              sudo yum install -y python3-pyyaml python3-lxml python3-prettytable clang
+              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
               sudo yum update -y libarchive
               gcc_toolset_ver=9
               # so clang is able to find gcc-toolset-${{gcc_toolset_ver}} which is listed as a