Skip to content

Commit cbea550

Browse files
authored
CXX-2338 remove yum install of GNU parallel (#1508)
* Migrate clang-tidy to rhel9-latest distro * Format source file list with prefix
1 parent ab763ed commit cbea550

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.evergreen/config_generator/components/clang_tidy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from config_generator.components.funcs.install_c_driver import InstallCDriver
88
from config_generator.components.funcs.setup import Setup
9-
from config_generator.etc.distros import compiler_to_vars, find_small_distro
9+
from config_generator.etc.distros import compiler_to_vars, find_large_distro
1010
from config_generator.etc.function import Function
1111
from config_generator.etc.utils import bash_exec
1212

@@ -40,8 +40,8 @@ def functions():
4040

4141

4242
def tasks():
43-
distro_name = 'rhel80'
44-
distro = find_small_distro(distro_name)
43+
distro_name = 'rhel9-latest'
44+
distro = find_large_distro(distro_name)
4545

4646
return [
4747
EvgTask(

.evergreen/config_generator/etc/distros.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def ls_distro(name, **kwargs):
6363
]
6464

6565
RHEL_DISTROS = [
66+
*ls_distro(name='rhel9-latest', os='rhel', os_type='linux', os_ver='9'),
6667
*ls_distro(name='rhel7.9', os='rhel', os_type='linux', os_ver='7.9'),
6768
*ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'),
6869
*ls_distro(name='rhel84', os='rhel', os_type='linux', os_ver='8.4'),
@@ -72,7 +73,6 @@ def ls_distro(name, **kwargs):
7273
*ls_distro(name='rhel93', os='rhel', os_type='linux', os_ver='9.3'),
7374
*ls_distro(name='rhel94', os='rhel', os_type='linux', os_ver='9.4'),
7475
*ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'),
75-
*ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.0'),
7676
]
7777

7878
RHEL_ARM64_DISTROS = [

.evergreen/generated_configs/tasks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ tasks:
151151
- func: benchmarks-compile
152152
- func: benchmarks-run
153153
- name: clang-tidy
154-
run_on: rhel80-small
155-
tags: [clang-tidy, rhel80]
154+
run_on: rhel9-latest-large
155+
tags: [clang-tidy, rhel9-latest]
156156
commands:
157157
- func: setup
158158
- func: install_c_driver

etc/run-clang-tidy.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ if [[ "${distro_id:?}" != rhel* ]]; then
1111
exit 1
1212
fi
1313

14-
if ! command -V parallel >/dev/null; then
15-
sudo yum install -q -y parallel
16-
fi
14+
# Required to execute clang-tidy commands in parallel.
15+
command -V parallel >/dev/null
1716

1817
# shellcheck source=/dev/null
1918
. .evergreen/scripts/install-build-tools.sh
@@ -70,7 +69,7 @@ find_args=(
7069
)
7170

7271
echo "Scanning the following files:"
73-
find src "${find_args[@]}"
72+
find src "${find_args[@]}" | sed -E -e 's/^/ - /'
7473

7574
# TODO: update clang-tidy config and address warnings.
7675
{

0 commit comments

Comments
 (0)