Skip to content

Commit 43457ca

Browse files
joshbsiegeljoshbsiegel
authored
CDRIVER-4602 switch to supported build hosts (#1760)
* remove/update Ubuntu <=18.04 * download abi-compliance-check manually in evg * remove RHEL <=7.6 * add Ubuntu 16.04 support in Earthly * upgrade RHEL87 to supported RHEL89 * upgrade RHEL90 to supported RHEL92 * add CentOS 7 support in Earthly * remove unused vsCurrent2 distros * fix RHEL8.9 typo * rename variants according to compiler version * regenerate updated variant names * run 4.2 tests on Debian 10
1 parent 1392d21 commit 43457ca

File tree

20 files changed

+1091
-1269
lines changed

20 files changed

+1091
-1269
lines changed

‎.evergreen/config_generator/components/abi_compliance_check.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
class CheckABICompliance(Function):
1010
name = 'abi-compliance-check'
1111
commands = [
12+
bash_exec(
13+
command_type=EvgCommandType.SETUP,
14+
working_dir='mongoc',
15+
script='.evergreen/scripts/abi-compliance-check-setup.sh'
16+
),
1217
bash_exec(
1318
command_type=EvgCommandType.SETUP,
1419
add_expansions_to_env=True,

‎.evergreen/config_generator/components/c_std_compile.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
# fmt: off
1919
MATRIX = [
2020
('debian92', 'clang', None, [11, ]),
21-
('ubuntu1604', 'clang', 'i686', [11, ]),
22-
('ubuntu1604', 'clang', None, [11, ]),
23-
('ubuntu1804', 'clang', 'i686', [11, ]),
24-
('ubuntu1804', 'gcc', None, [11, ]),
2521
('debian10', 'clang', None, [11, ]),
2622
('debian10', 'gcc', None, [11, 17]),
2723
('debian11', 'clang', None, [11, ]),

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
('debian92', 'gcc', None, ['cyrus']),
2222
('rhel80', 'gcc', None, ['cyrus']),
2323
('rhel83-zseries', 'gcc', None, ['cyrus']),
24-
('ubuntu1604', 'clang', None, ['cyrus']),
25-
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
26-
('ubuntu1804', 'gcc', None, ['cyrus']),
24+
('ubuntu2004', 'clang', None, ['cyrus']),
2725
('ubuntu2004', 'gcc', None, ['cyrus']),
2826
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
2927
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
@@ -33,17 +31,18 @@
3331
TEST_MATRIX = [
3432
# 4.2 and 4.4 not available on rhel83-zseries.
3533
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
36-
37-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
38-
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
34+
3935
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
4036

4137
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
42-
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
43-
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
38+
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4439
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
45-
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
40+
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4641
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
42+
43+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
44+
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),
45+
4746
]
4847
# fmt: on
4948
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/earthly.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919

2020
EnvKey = Literal[
21+
"u16",
2122
"u18",
2223
"u20",
2324
"u22",
@@ -26,6 +27,7 @@
2627
"alpine3.18",
2728
"alpine3.19",
2829
"archlinux",
30+
"centos7"
2931
]
3032
"Identifiers for environments. These correspond to special 'env.*' targets in the Earthfile."
3133
CompilerName = Literal["gcc", "clang"]
@@ -36,7 +38,7 @@
3638
"Valid options for the SASL configuration parameter"
3739
TLSOption = Literal["LibreSSL", "OpenSSL", "off"]
3840
"Options for the TLS backend configuration parameter (AKA 'ENABLE_SSL')"
39-
CxxVersion = Literal["r3.8.0", "r3.9.0"]
41+
CxxVersion = Literal["r3.8.0", "r3.9.0", "none"]
4042
"C++ driver refs that are under CI test"
4143

4244
# A separator character, since we cannot use whitespace
@@ -54,6 +56,8 @@ def os_split(env: EnvKey) -> tuple[str, None | str]:
5456
# Match 'u22', 'u20', 'u71' etc.
5557
case ubu if mat := re.match(r"u(\d\d)", ubu):
5658
return "Ubuntu", f"{mat[1]}.04"
59+
case "centos7":
60+
return "CentOS", "7.0"
5761
case _:
5862
raise ValueError(
5963
f"Failed to split OS env key {env=} into a name+version pair (unrecognized)"
@@ -149,8 +153,17 @@ def task_filter(env: EarthlyVariant, conf: Configuration) -> bool:
149153
# Other sasl=off tasks we'll just ignore:
150154
case _, ("off", _tls, _cxx):
151155
return False
152-
# Ubuntu does not ship with a LibreSSL package:
153-
case e, (_sasl, "LibreSSL", _cxx) if e.display_name.startswith("Ubuntu"):
156+
# Ubuntu and CentOS do not ship with a LibreSSL package:
157+
case e, (_sasl, "LibreSSL", _cxx) if e.display_name.startswith("Ubuntu") or e.display_name.startswith("CentOS"):
158+
return False
159+
# u16 is not capable of building mongocxx
160+
case e, (_, _, "none") if e.display_name.startswith("Ubuntu 16") or e.display_name.startswith("CentOS 7"):
161+
return True
162+
# Exclude u16 for all other configurations
163+
case e, _ if e.display_name.startswith("Ubuntu 16") or e.display_name.startswith("CentOS 7"):
164+
return False
165+
# Exclude all other envs
166+
case _, (_, _, "none"):
154167
return False
155168
# Anything else: Allow it to run:
156169
case _:
@@ -242,7 +255,6 @@ def earthly_task(
242255
"ubuntu2204-large",
243256
"ubuntu2004-small",
244257
"ubuntu2004",
245-
"ubuntu1804-medium",
246258
"debian10",
247259
"debian11",
248260
"amazon2",
@@ -251,9 +263,16 @@ def earthly_task(
251263

252264
def tasks() -> Iterable[EvgTask]:
253265
for conf in all_possible(Configuration):
266+
# test-example is a target in all configurations
267+
targets = ["test-example"]
268+
269+
# test-cxx-driver is only a target in configurations with specified mongocxx versions
270+
if conf.test_mongocxx_ref != "none":
271+
targets.append("test-cxx-driver")
272+
254273
task = earthly_task(
255274
name=f"check:{conf.suffix}",
256-
targets=("test-example", "test-cxx-driver"),
275+
targets=targets,
257276
config=conf,
258277
)
259278
if task is not None:

‎.evergreen/config_generator/components/loadbalanced.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from config_generator.etc.distros import make_distro_str, find_small_distro, find_large_distro
1313
from config_generator.etc.utils import bash_exec
1414

15-
# Use `rhel8.7` distro. `rhel8.7` distro includes necessary dependency: `haproxy`.
16-
_DISTRO_NAME = "rhel87"
15+
# Use `rhel8.9` distro. `rhel8.9` distro includes necessary dependency: `haproxy`.
16+
_DISTRO_NAME = "rhel8.9"
1717
_COMPILER = "gcc"
1818

1919

‎.evergreen/config_generator/components/sanitizers/asan_cse.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
# pylint: disable=line-too-long
1111
# fmt: off
1212
COMPILE_MATRIX = [
13-
('ubuntu1804', 'clang', None, ['cyrus']),
1413
('ubuntu2004', 'clang', None, ['cyrus']),
14+
('debian10', 'clang', None, ['cyrus']),
1515
]
1616

1717
TEST_MATRIX = [
18-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0']),
19-
2018
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
21-
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
22-
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['7.0', '8.0', 'latest']),
19+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
20+
21+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
22+
('debian10', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2']),
2323
]
2424
# fmt: on
2525
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sanitizers/asan_sasl.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
# pylint: disable=line-too-long
1111
# fmt: off
1212
COMPILE_MATRIX = [
13-
('ubuntu1604', 'clang', None, ['cyrus']),
14-
('ubuntu1804', 'clang', None, ['cyrus']),
1513
('ubuntu2004', 'clang', None, ['cyrus']),
14+
('debian10', 'clang', None, ['cyrus']),
1615
]
1716

1817
TEST_MATRIX = [
19-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0']),
18+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
2019

21-
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
22-
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', '8.0', 'latest']),
20+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
21+
('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']),
2322
]
2423
# fmt: on
2524
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sanitizers/tsan_sasl.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
# pylint: disable=line-too-long
1111
# fmt: off
1212
COMPILE_MATRIX = [
13-
('ubuntu1804', 'clang', None, ['cyrus']),
1413
('ubuntu2004', 'clang', None, ['cyrus']),
14+
('debian10', 'clang', None, ['cyrus']),
1515
]
1616

1717
TEST_OPENSSL_MATRIX = [
18-
('ubuntu1804', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0']),
18+
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
1919

20-
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
21-
('ubuntu2004', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['7.0', '8.0', 'latest']),
20+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
21+
('debian10', 'clang', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['4.2']),
2222
]
2323
# fmt: on
2424
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/sasl/nossl.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('ubuntu1604', 'gcc', None, ['off']),
19-
('ubuntu1804', 'gcc', None, ['off']),
2018
('ubuntu2004', 'gcc', None, ['off']),
2119
('windows-vsCurrent', 'vs2017x64', None, ['off']),
20+
('debian10', 'gcc', None, ['off']),
2221
]
2322

2423
TEST_MATRIX = [
25-
('ubuntu1804', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.0', '4.2', '4.4', '5.0', '6.0', ]),
26-
('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], [ '7.0', '8.0', 'latest']),
24+
('ubuntu2004', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
25+
26+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
27+
('debian10', 'gcc', None, 'off', ['noauth'], ['server', 'replica', 'sharded'], ['4.2']),
2728
]
2829
# fmt: on
2930
# pylint: enable=line-too-long

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@
2121
('debian11', 'gcc', None, ['cyrus']),
2222
('debian92', 'clang', None, ['cyrus']),
2323
('debian92', 'gcc', None, ['cyrus']),
24-
('rhel70', 'gcc', None, ['cyrus']),
2524
('rhel80', 'gcc', None, ['cyrus']),
2625
('rhel81-power8', 'gcc', None, ['cyrus']),
2726
('rhel83-zseries', 'gcc', None, ['cyrus']),
28-
('ubuntu1604-arm64', 'gcc', None, ['cyrus']),
29-
('ubuntu1604', 'clang', None, ['cyrus']),
30-
('ubuntu1804-arm64', 'gcc', None, ['cyrus']),
31-
('ubuntu1804', 'gcc', None, ['cyrus']),
27+
('ubuntu2004', 'clang', None, ['cyrus']),
3228
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
3329
('ubuntu2004', 'gcc', None, ['cyrus']),
3430
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
@@ -37,18 +33,13 @@
3733
TEST_MATRIX = [
3834
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
3935
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', '8.0', 'latest']),
40-
('ubuntu1804-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', ]),
41-
('ubuntu1804', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.0', '4.2', '4.4', '5.0', '6.0', ]),
4236

43-
# Test 7.0+ with Ubuntu 20.04+ since MongoDB 7.0 no longer ships binaries for Ubuntu 18.04.
44-
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', '8.0', 'latest']),
45-
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['7.0', '8.0', 'latest']),
37+
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
38+
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4639
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], [ 'latest']),
4740

48-
# Test ARM64 + 4.0 on Ubuntu 16.04, as MongoDB server does not produce
49-
# downloads for Ubuntu 18.04 arm64.
50-
# See: https://www.mongodb.com/docs/manual/administration/production-notes/
51-
('ubuntu1604-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.0']),
41+
# Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+.
42+
('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']),
5243
]
5344
# fmt: on
5445
# pylint: enable=line-too-long

‎.evergreen/config_generator/components/scan_build.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@
1919
# fmt: off
2020
MATRIX = [
2121
('macos-1100', 'clang', None ),
22-
('ubuntu1604-arm64', 'clang', None ),
23-
('ubuntu1604', 'clang', 'i686'),
24-
('ubuntu1604', 'clang', None ),
25-
('ubuntu1804-arm64', 'clang', None ),
26-
('ubuntu1804', 'clang', 'i686'),
22+
('ubuntu2004-arm64', 'clang', None ),
23+
('ubuntu2004', 'clang', 'i686'),
2724
]
2825
# fmt: on
2926
# pylint: enable=line-too-long

‎.evergreen/config_generator/etc/distros.py

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,57 +60,41 @@ def validate_os_ver(cls, value):
6060
]
6161

6262
RHEL_DISTROS = [
63-
Distro(name='rhel70-large', os='rhel', os_type='linux', os_ver='7.0', size='large'),
64-
Distro(name='rhel70-small', os='rhel', os_type='linux', os_ver='7.0', size='small'),
65-
Distro(name='rhel76-large', os='rhel', os_type='linux', os_ver='7.6', size='large'),
66-
Distro(name='rhel76-small', os='rhel', os_type='linux', os_ver='7.6', size='small'),
6763
Distro(name='rhel80-large', os='rhel', os_type='linux', os_ver='8.0', size='large'),
6864
Distro(name='rhel80-small', os='rhel', os_type='linux', os_ver='8.0', size='small'),
6965
Distro(name='rhel84-large', os='rhel', os_type='linux', os_ver='8.4', size='large'),
7066
Distro(name='rhel84-small', os='rhel', os_type='linux', os_ver='8.4', size='small'),
71-
Distro(name='rhel87-large', os='rhel', os_type='linux', os_ver='8.7', size='large'),
72-
Distro(name='rhel87-small', os='rhel', os_type='linux', os_ver='8.7', size='small'),
73-
Distro(name='rhel90-large', os='rhel', os_type='linux', os_ver='9.0', size='large'),
74-
Distro(name='rhel90-small', os='rhel', os_type='linux', os_ver='9.0', size='small'),
67+
Distro(name='rhel8.9-large', os='rhel', os_type='linux', os_ver='8.7', size='large'),
68+
Distro(name='rhel8.9-small', os='rhel', os_type='linux', os_ver='8.7', size='small'),
69+
Distro(name='rhel92-large', os='rhel', os_type='linux', os_ver='9.0', size='large'),
70+
Distro(name='rhel92-small', os='rhel', os_type='linux', os_ver='9.0', size='small'),
7571
]
7672

7773
RHEL_ARM64_DISTROS = [
7874
Distro(name='rhel82-arm64-large', os='rhel', os_type='linux', os_ver='8.2', size='large', arch='arm64'),
7975
Distro(name='rhel82-arm64-small', os='rhel', os_type='linux', os_ver='8.2', size='small', arch='arm64'),
80-
Distro(name='rhel90-arm64-large', os='rhel', os_type='linux', os_ver='9.0', size='large', arch='arm64'),
81-
Distro(name='rhel90-arm64-small', os='rhel', os_type='linux', os_ver='9.0', size='small', arch='arm64'),
76+
Distro(name='rhel92-arm64-large', os='rhel', os_type='linux', os_ver='9.0', size='large', arch='arm64'),
77+
Distro(name='rhel92-arm64-small', os='rhel', os_type='linux', os_ver='9.0', size='small', arch='arm64'),
8278
]
8379

8480
RHEL_POWER8_DISTROS = [
85-
Distro(name='rhel71-power8-large', os='rhel', os_type='linux', os_ver='7.1', size='large', arch='power8'),
86-
Distro(name='rhel71-power8-small', os='rhel', os_type='linux', os_ver='7.1', size='small', arch='power8'),
8781
Distro(name='rhel81-power8-large', os='rhel', os_type='linux', os_ver='8.1', size='large', arch='power8'),
8882
Distro(name='rhel81-power8-small', os='rhel', os_type='linux', os_ver='8.1', size='small', arch='power8'),
8983
]
9084

9185
RHEL_ZSERIES_DISTROS = [
92-
Distro(name='rhel72-zseries-large', os='rhel', os_type='linux', os_ver='7.2', size='large', arch='zseries'),
93-
Distro(name='rhel72-zseries-small', os='rhel', os_type='linux', os_ver='7.2', size='small', arch='zseries'),
9486
Distro(name='rhel83-zseries-large', os='rhel', os_type='linux', os_ver='8.3', size='large', arch='zseries'),
9587
Distro(name='rhel83-zseries-small', os='rhel', os_type='linux', os_ver='8.3', size='small', arch='zseries'),
9688
]
9789

9890
UBUNTU_DISTROS = [
99-
Distro(name='ubuntu1604-large', os='ubuntu', os_type='linux', os_ver='16.04', size='large'),
100-
Distro(name='ubuntu1604-small', os='ubuntu', os_type='linux', os_ver='16.04', size='small'),
101-
Distro(name='ubuntu1804-large', os='ubuntu', os_type='linux', os_ver='18.04', size='large'),
102-
Distro(name='ubuntu1804-small', os='ubuntu', os_type='linux', os_ver='18.04', size='small'),
10391
Distro(name='ubuntu2004-large', os='ubuntu', os_type='linux', os_ver='20.04', size='large'),
10492
Distro(name='ubuntu2004-small', os='ubuntu', os_type='linux', os_ver='20.04', size='small'),
10593
Distro(name='ubuntu2204-large', os='ubuntu', os_type='linux', os_ver='22.04', size='large'),
10694
Distro(name='ubuntu2204-small', os='ubuntu', os_type='linux', os_ver='22.04', size='small'),
10795
]
10896

10997
UBUNTU_ARM64_DISTROS = [
110-
Distro(name='ubuntu1604-arm64-large', os='ubuntu', os_type='linux', os_ver='16.04', size='large', arch='arm64'),
111-
Distro(name='ubuntu1604-arm64-small', os='ubuntu', os_type='linux', os_ver='16.04', size='small', arch='arm64'),
112-
Distro(name='ubuntu1804-arm64-large', os='ubuntu', os_type='linux', os_ver='18.04', size='large', arch='arm64'),
113-
Distro(name='ubuntu1804-arm64-small', os='ubuntu', os_type='linux', os_ver='18.04', size='small', arch='arm64'),
11498
Distro(name='ubuntu2004-arm64-large', os='ubuntu', os_type='linux', os_ver='20.04', size='large', arch='arm64'),
11599
Distro(name='ubuntu2004-arm64-small', os='ubuntu', os_type='linux', os_ver='20.04', size='small', arch='arm64'),
116100
Distro(name='ubuntu2204-arm64-large', os='ubuntu', os_type='linux', os_ver='22.04', size='large', arch='arm64'),
@@ -139,9 +123,6 @@ def validate_os_ver(cls, value):
139123

140124
Distro(name='windows-vsCurrent-large', os='windows', os_type='windows', vs_ver='vsCurrent', size='large'), # Windows Server 2019
141125
Distro(name='windows-vsCurrent-small', os='windows', os_type='windows', vs_ver='vsCurrent', size='small'), # Windows Server 2019
142-
143-
Distro(name='windows-vsCurrent2-large', os='windows', os_type='windows', vs_ver='vsCurrent2', size='large'),
144-
Distro(name='windows-vsCurrent2-small', os='windows', os_type='windows', vs_ver='vsCurrent2', size='small'),
145126
]
146127
#fmt: on
147128
# pylint: enable=line-too-long

‎.evergreen/generated_configs/functions.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
functions:
22
abi-compliance-check:
3+
- command: subprocess.exec
4+
type: setup
5+
params:
6+
binary: bash
7+
working_dir: mongoc
8+
args:
9+
- -c
10+
- .evergreen/scripts/abi-compliance-check-setup.sh
311
- command: subprocess.exec
412
type: setup
513
params:

0 commit comments

Comments
 (0)