Skip to content

Commit db2ff32

Browse files
eramongodberamongodb
authored
Use EVG distro system uv binaries (#2127)
1 parent f837282 commit db2ff32

38 files changed

+715
-3622
lines changed

‎.evergreen/config_generator/components/abi_compliance_check.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from shrub.v3.evg_command import EvgCommandType, s3_put
22
from shrub.v3.evg_task import EvgTask
33

4-
from config_generator.components.funcs.install_uv import InstallUV
4+
from config_generator.components.funcs.set_cache_dir import SetCacheDir
55
from config_generator.etc.function import Function
66
from config_generator.etc.utils import bash_exec
77

88

99
class CheckABICompliance(Function):
1010
name = 'abi-compliance-check'
11-
commands = [
11+
commands = SetCacheDir.commands + [
1212
bash_exec(
1313
command_type=EvgCommandType.SETUP,
1414
working_dir='mongoc',
@@ -19,7 +19,7 @@ class CheckABICompliance(Function):
1919
command_type=EvgCommandType.TEST,
2020
add_expansions_to_env=True,
2121
working_dir='mongoc',
22-
include_expansions_in_env=['MONGO_C_DRIVER_CACHE_DIR', 'UV_INSTALL_DIR'],
22+
include_expansions_in_env=['MONGO_C_DRIVER_CACHE_DIR'],
2323
script='.evergreen/scripts/abi-compliance-check.sh',
2424
),
2525
s3_put(
@@ -56,7 +56,6 @@ def tasks():
5656
EvgTask(
5757
name=CheckABICompliance.name,
5858
commands=[
59-
InstallUV.call(),
6059
CheckABICompliance.call(),
6160
],
6261
)

‎.evergreen/config_generator/components/c_std_compile.py‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from shrub.v3.evg_command import EvgCommandType
33
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

5-
from config_generator.components.funcs.install_uv import InstallUV
65
from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str
76
from config_generator.etc.function import Function
87
from config_generator.etc.utils import bash_exec
@@ -14,7 +13,6 @@
1413
# fmt: off
1514
MATRIX = [
1615
('rhel80', 'clang', None, [99, 11, 17, ]), # Clang 7.0
17-
('ubuntu2004', 'clang-10', None, [99, 11, 17, 23]), # Clang 10.0 (max: C2x)
1816
('rhel84', 'clang', None, [99, 11, 17, 23]), # Clang 11.0 (max: C2x)
1917
('ubuntu2204', 'clang-12', None, [99, 11, 17, 23]), # Clang 12.0 (max: C2x)
2018
('rhel90', 'clang', None, [99, 11, 17, 23]), # Clang 13.0 (max: C2x)
@@ -24,16 +22,15 @@
2422
('rhel94', 'clang', None, [99, 11, 17, 23]), # Clang 17.0 (max: C2x)
2523
('rhel95', 'clang', None, [99, 11, 17, 23]), # Clang 18.0 (max: C23)
2624

27-
('rhel7-latest', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11)
28-
('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17)
29-
('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17)
30-
('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x)
31-
('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x)
32-
('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x)
33-
('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x)
34-
('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x)
35-
('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x)
36-
('ubuntu2404', 'gcc-13', None, [99, 11, 17, 23]), # GCC 13.3 (max: C2x)
25+
('rhel7-latest', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11)
26+
('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17)
27+
('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17)
28+
('debian11-latest', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x)
29+
('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x)
30+
('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x)
31+
('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x)
32+
('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x)
33+
('ubuntu2404', 'gcc-13', None, [99, 11, 17, 23]), # GCC 13.3 (max: C2x)
3734

3835
('macos-14-arm64', 'clang', None, [99, 11, 17, 23]), # Apple Clang
3936

@@ -91,7 +88,7 @@ def tasks():
9188
name=task_name,
9289
run_on=distro.name,
9390
tags=tags + [f'std-c{std}'],
94-
commands=[InstallUV.call(), StdCompile.call(vars=compile_vars | with_std)],
91+
commands=[StdCompile.call(vars=compile_vars | with_std)],
9592
)
9693
)
9794

‎.evergreen/config_generator/components/clang_format.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from shrub.v3.evg_command import EvgCommandType
33
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

5-
from config_generator.components.funcs.install_uv import InstallUV
65
from config_generator.etc.distros import find_small_distro
76
from config_generator.etc.function import Function
87
from config_generator.etc.utils import bash_exec
@@ -19,7 +18,7 @@ class ClangFormat(Function):
1918
env={
2019
'DRYRUN': '1',
2120
},
22-
script='PATH="${UV_INSTALL_DIR}:$PATH" uv run --frozen --only-group=format tools/format.py --mode=check',
21+
script='uv run --frozen --only-group=format tools/format.py --mode=check',
2322
),
2423
]
2524

@@ -33,7 +32,6 @@ def tasks():
3332
name=TAG,
3433
tags=[TAG],
3534
commands=[
36-
InstallUV.call(),
3735
ClangFormat.call(),
3836
],
3937
)

‎.evergreen/config_generator/components/cse/openssl.py‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,34 @@
1414
# fmt: off
1515
COMPILE_MATRIX = [
1616
# For test matrix.
17-
('rhel8-latest', 'gcc', None, ['cyrus']),
18-
('rhel8-zseries', 'gcc', None, ['cyrus']), # Big Endian.
19-
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
20-
('windows-vsCurrent', 'vs2022x64', None, ['cyrus']),
17+
('rhel8-latest', 'gcc', None, ['cyrus']),
18+
('rhel8-arm64-latest', 'gcc', None, ['cyrus']),
19+
('rhel8-zseries', 'gcc', None, ['cyrus']), # Big Endian.
20+
('windows-vsCurrent', 'vs2022x64', None, ['cyrus']),
2121

2222
# For compile only.
23-
('debian11', 'clang', None, ['cyrus']),
24-
('debian11', 'gcc', None, ['cyrus']),
25-
('debian12', 'clang', None, ['cyrus']),
26-
('debian12', 'gcc', None, ['cyrus']),
27-
('rhel80', 'gcc', None, ['cyrus']),
28-
('ubuntu2004', 'gcc', None, ['cyrus']),
29-
('ubuntu2004', 'clang', None, ['cyrus']),
30-
('ubuntu2204', 'gcc', None, ['cyrus']),
31-
('ubuntu2204', 'clang-12', None, ['cyrus']),
32-
('ubuntu2404', 'gcc', None, ['cyrus']),
33-
('ubuntu2404', 'clang-14', None, ['cyrus']),
23+
('debian11-latest', 'clang', None, ['cyrus']),
24+
('debian11-latest', 'gcc', None, ['cyrus']),
25+
('debian12-latest', 'clang', None, ['cyrus']),
26+
('debian12-latest', 'gcc', None, ['cyrus']),
27+
('rhel80', 'gcc', None, ['cyrus']),
28+
('ubuntu2204', 'gcc', None, ['cyrus']),
29+
('ubuntu2204', 'clang-12', None, ['cyrus']),
30+
('ubuntu2404', 'gcc', None, ['cyrus']),
31+
('ubuntu2404', 'clang-14', None, ['cyrus']),
3432
]
3533

3634
# QE (subset of CSFLE) requires 7.0+ and are skipped by "server" tasks.
3735
TEST_MATRIX = [
3836
('rhel8-latest', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
3937

40-
('windows-vsCurrent', 'vs2022x64', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
41-
42-
# ubuntu2004-arm64 only provides 4.4+.
43-
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
38+
# rhel8-arm64 only provides 4.4+.
39+
('rhel8-arm64-latest', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4440

4541
# rhel8-zseries only provides 5.0+. Resource-limited: use sparingly.
4642
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['sharded'], ['5.0', 'latest']),
43+
44+
('windows-vsCurrent', 'vs2022x64', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4745
]
4846
# fmt: on
4947
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/earthly.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ def earthly_task(
274274

275275
CONTAINER_RUN_DISTROS = [
276276
'amazon2',
277-
'debian11-large',
278-
'debian12-large',
277+
"debian11-latest-large",
278+
'debian12-latest-large',
279279
'ubuntu2204-large',
280280
'ubuntu2404-large',
281281
]

‎.evergreen/config_generator/components/funcs/install_uv.py‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.evergreen/config_generator/components/funcs/run_simple_http_server.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ class RunSimpleHTTPServer(Function):
1212
command_type=command_type,
1313
background=True,
1414
working_dir='mongoc',
15-
include_expansions_in_env=['UV_INSTALL_DIR'],
1615
script="""\
1716
set -o errexit
1817
echo "Starting simple HTTP server..."
19-
PATH="${UV_INSTALL_DIR}:$PATH" uvx python .evergreen/scripts/simple_http_server.py
18+
uvx python .evergreen/scripts/simple_http_server.py
2019
echo "Starting simple HTTP server... done."
2120
""",
2221
),

‎.evergreen/config_generator/components/loadbalanced.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
66
from config_generator.components.funcs.fetch_build import FetchBuild
77
from config_generator.components.funcs.fetch_det import FetchDET
8-
from config_generator.components.funcs.install_uv import InstallUV
98
from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
109
from config_generator.components.funcs.run_tests import RunTests
1110
from config_generator.components.funcs.upload_build import UploadBuild
@@ -25,6 +24,7 @@ def functions():
2524
script="""\
2625
export DRIVERS_TOOLS=./drivers-evergreen-tools
2726
export MONGODB_URI="${MONGODB_URI}"
27+
export PATH="$(uv tool dir --bin):$PATH" # DEVPROD-19733
2828
$DRIVERS_TOOLS/.evergreen/run-load-balancer.sh start
2929
""",
3030
),
@@ -57,7 +57,6 @@ def make_test_task(auth: bool, ssl: bool, server_version: str):
5757
'LOAD_BALANCER': 'on',
5858
}
5959
),
60-
InstallUV.call(),
6160
RunSimpleHTTPServer.call(),
6261
FunctionCall(func='start-load-balancer', vars={'MONGODB_URI': 'mongodb://localhost:27017,localhost:27018'}),
6362
RunTests().call(
@@ -79,11 +78,10 @@ def tasks():
7978
run_on=find_large_distro(_DISTRO_NAME).name,
8079
tags=['loadbalanced', _DISTRO_NAME, _COMPILER],
8180
commands=[
82-
InstallUV.call(),
8381
bash_exec(
8482
command_type=EvgCommandType.TEST,
8583
env={'CC': _COMPILER, 'CFLAGS': '-fno-omit-frame-pointer', 'SSL': 'OPENSSL'},
86-
include_expansions_in_env=['distro_id', 'UV_INSTALL_DIR'],
84+
include_expansions_in_env=['distro_id'],
8785
working_dir='mongoc',
8886
script='.evergreen/scripts/compile.sh',
8987
),

‎.evergreen/config_generator/components/make_docs.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from shrub.v3.evg_command import EvgCommandType, s3_put
22
from shrub.v3.evg_task import EvgTask
33

4-
from config_generator.components.funcs.install_uv import InstallUV
54
from config_generator.etc.function import Function, merge_defns
65
from config_generator.etc.utils import bash_exec
76

@@ -15,7 +14,7 @@ class MakeDocs(Function):
1514
include_expansions_in_env=['distro_id'],
1615
script="""\
1716
# See SphinxBuild.cmake for EVG_DOCS_BUILD reasoning
18-
PATH="${UV_INSTALL_DIR}:$PATH" uv run --frozen --only-group docs env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh
17+
uv run --frozen --only-group docs env EVG_DOCS_BUILD=1 .evergreen/scripts/build-docs.sh
1918
""",
2019
),
2120
]
@@ -116,7 +115,6 @@ def tasks():
116115
EvgTask(
117116
name='make-docs',
118117
commands=[
119-
InstallUV.call(),
120118
MakeDocs.call(),
121119
UploadDocs.call(),
122120
UploadManPages.call(),

‎.evergreen/config_generator/components/mock_server.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from shrub.v3.evg_command import EvgCommandType
33
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

5-
from config_generator.components.funcs.install_uv import InstallUV
65
from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
76
from config_generator.etc.utils import bash_exec
87

@@ -13,7 +12,6 @@ def tasks():
1312
name='mock-server-test',
1413
run_on='ubuntu2204-small',
1514
commands=[
16-
InstallUV.call(),
1715
RunSimpleHTTPServer.call(),
1816
bash_exec(
1917
command_type=EvgCommandType.TEST,

0 commit comments

Comments
 (0)