From bf13ae2ead4bab09b191984bc703ecd3f35889b4 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 11 Nov 2025 10:23:50 -0600 Subject: [PATCH 1/2] CXX-2338 migrate clang-tidy task to rhel96 --- .evergreen/config_generator/components/clang_tidy.py | 2 +- .evergreen/config_generator/etc/distros.py | 2 +- .evergreen/generated_configs/tasks.yml | 4 ++-- etc/run-clang-tidy.sh | 6 +----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.evergreen/config_generator/components/clang_tidy.py b/.evergreen/config_generator/components/clang_tidy.py index ca04269503..ac2741ba2f 100644 --- a/.evergreen/config_generator/components/clang_tidy.py +++ b/.evergreen/config_generator/components/clang_tidy.py @@ -40,7 +40,7 @@ def functions(): def tasks(): - distro_name = 'rhel80' + distro_name = 'rhel9-latest' distro = find_small_distro(distro_name) return [ diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index 2fbafc5987..3a6e64b8f8 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -63,6 +63,7 @@ def ls_distro(name, **kwargs): ] RHEL_DISTROS = [ + *ls_distro(name='rhel9-latest', os='rhel', os_type='linux', os_ver='9'), *ls_distro(name='rhel7.9', os='rhel', os_type='linux', os_ver='7.9'), *ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'), *ls_distro(name='rhel84', os='rhel', os_type='linux', os_ver='8.4'), @@ -72,7 +73,6 @@ def ls_distro(name, **kwargs): *ls_distro(name='rhel93', os='rhel', os_type='linux', os_ver='9.3'), *ls_distro(name='rhel94', os='rhel', os_type='linux', os_ver='9.4'), *ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'), - *ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.0'), ] RHEL_ARM64_DISTROS = [ diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 1c7b38a3b6..66f0a2aebd 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -151,8 +151,8 @@ tasks: - func: benchmarks-compile - func: benchmarks-run - name: clang-tidy - run_on: rhel80-small - tags: [clang-tidy, rhel80] + run_on: rhel9-latest-small + tags: [clang-tidy, rhel9-latest] commands: - func: setup - func: install_c_driver diff --git a/etc/run-clang-tidy.sh b/etc/run-clang-tidy.sh index 47efcd3900..9d7b4f7ecf 100755 --- a/etc/run-clang-tidy.sh +++ b/etc/run-clang-tidy.sh @@ -11,10 +11,6 @@ if [[ "${distro_id:?}" != rhel* ]]; then exit 1 fi -if ! command -V parallel >/dev/null; then - sudo yum install -q -y parallel -fi - # shellcheck source=/dev/null . .evergreen/scripts/install-build-tools.sh install_build_tools @@ -70,7 +66,7 @@ find_args=( ) echo "Scanning the following files:" -find src "${find_args[@]}" +find src "${find_args[@]}" | sed -E -e 's/^/ - /' # TODO: update clang-tidy config and address warnings. { From 3cf6c8639a839f4d5a6558c0a3f3d0a4e66e459d Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Tue, 11 Nov 2025 10:36:08 -0600 Subject: [PATCH 2/2] Add command check --- etc/run-clang-tidy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/run-clang-tidy.sh b/etc/run-clang-tidy.sh index 9d7b4f7ecf..c75dd6f3a8 100755 --- a/etc/run-clang-tidy.sh +++ b/etc/run-clang-tidy.sh @@ -11,6 +11,8 @@ if [[ "${distro_id:?}" != rhel* ]]; then exit 1 fi +command -V parallel >/dev/null + # shellcheck source=/dev/null . .evergreen/scripts/install-build-tools.sh install_build_tools