Skip to content

Commit ae9fcb3

Browse files
eramongodberamongodb
authored
Migrate to newer Power, zSeries, and MacOS distros (#1791)
1 parent 5697f63 commit ae9fcb3

File tree

12 files changed

+493
-406
lines changed

12 files changed

+493
-406
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,21 @@
1414
# pylint: disable=line-too-long
1515
# fmt: off
1616
COMPILE_MATRIX = [
17-
('macos-1100', 'clang', None, ['cyrus']),
17+
('macos-14', 'clang', None, ['cyrus']),
18+
19+
('macos-11-arm64', 'clang', None, ['cyrus']),
20+
('macos-14-arm64', 'clang', None, ['cyrus']),
1821
]
1922

2023
# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
2124
TEST_MATRIX = [
22-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['4.2', '4.4', '5.0', '6.0' ]),
25+
('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0']),
26+
27+
('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']),
28+
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0']),
2329

2430
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
25-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], [ '7.0', '8.0', 'latest']),
31+
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server', 'replica' ], ['7.0', '8.0', 'latest']),
2632
]
2733
# fmt: on
2834
# pylint: enable=line-too-long

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
('debian92', 'clang', None, ['cyrus']),
2121
('debian92', 'gcc', None, ['cyrus']),
2222
('rhel80', 'gcc', None, ['cyrus']),
23-
('rhel83-zseries', 'gcc', None, ['cyrus']),
24-
('ubuntu2004', 'clang', None, ['cyrus']),
23+
('rhel8-zseries', 'gcc', None, ['cyrus']),
24+
('ubuntu2004', 'clang', None, ['cyrus']),
2525
('ubuntu2004', 'gcc', None, ['cyrus']),
2626
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
2727
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
2828
]
2929

3030
# TODO (CDRIVER-3789): test cse with the 'sharded' topology.
3131
TEST_MATRIX = [
32-
# 4.2 and 4.4 not available on rhel83-zseries.
33-
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
32+
# 4.2 and 4.4 not available on rhel8-zseries.
33+
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], ['5.0']),
3434

3535
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0' ]),
3636

3737
# Test 7.0+ with a replica set since Queryable Encryption does not support the 'server' topology. Queryable Encryption tests require 7.0+.
3838
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
39-
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
39+
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
4040
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
4141
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server', 'replica'], [ '7.0', '8.0', 'latest']),
4242

@@ -80,7 +80,7 @@ def tasks():
8080

8181
# PowerPC and zSeries are limited resources.
8282
for task in res:
83-
if any(pattern in task.run_on for pattern in ["power8", "zseries"]):
83+
if any(pattern in task.run_on for pattern in ["power", "zseries"]):
8484
task.patchable = False
8585

8686
return res
@@ -95,7 +95,7 @@ def variants():
9595

9696
# PowerPC and zSeries are limited resources.
9797
for task in TASKS:
98-
if any(pattern in task.run_on for pattern in ["power8", "zseries"]):
98+
if any(pattern in task.run_on for pattern in ["power", "zseries"]):
9999
tasks.append(
100100
TaskRef(
101101
name=task.name,

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('macos-1100', 'clang', None, ['cyrus']),
19-
('macos-1100-arm64', 'clang', None, ['cyrus']),
18+
('macos-14', 'clang', None, ['cyrus']),
19+
20+
('macos-11-arm64', 'clang', None, ['cyrus']),
21+
('macos-14-arm64', 'clang', None, ['cyrus']),
2022
]
2123

2224
TEST_MATRIX = [
23-
('macos-1100', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
25+
('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0']),
26+
27+
('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']),
28+
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']),
2429
]
2530
# fmt: on
2631
# pylint: enable=line-too-long

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
('debian92', 'clang', None, ['cyrus']),
2323
('debian92', 'gcc', None, ['cyrus']),
2424
('rhel80', 'gcc', None, ['cyrus']),
25-
('rhel81-power8', 'gcc', None, ['cyrus']),
26-
('rhel83-zseries', 'gcc', None, ['cyrus']),
27-
('ubuntu2004', 'clang', None, ['cyrus']),
25+
('rhel8-power', 'gcc', None, ['cyrus']),
26+
('rhel8-zseries', 'gcc', None, ['cyrus']),
27+
('ubuntu2004', 'clang', None, ['cyrus']),
2828
('ubuntu2004-arm64', 'gcc', None, ['cyrus']),
2929
('ubuntu2004', 'gcc', None, ['cyrus']),
3030
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
3131
]
3232

3333
TEST_MATRIX = [
34-
('rhel81-power8', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
35-
('rhel83-zseries', 'gcc', None, 'cyrus', ['auth'], ['server', ], [ '5.0', '6.0', '7.0', '8.0', 'latest']),
34+
('rhel8-power', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
35+
('rhel8-zseries', 'gcc', None, 'cyrus', ['auth'], ['server'], [ '5.0', '6.0', '7.0', '8.0', 'latest']),
3636

3737
('ubuntu2004-arm64', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
3838
('ubuntu2004', 'gcc', None, 'cyrus', ['auth'], ['server'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
@@ -75,7 +75,7 @@ def tasks():
7575

7676
# PowerPC and zSeries are limited resources.
7777
for task in res:
78-
if any(pattern in task.run_on for pattern in ["power8", "zseries"]):
78+
if any(pattern in task.run_on for pattern in ["power", "zseries"]):
7979
task.patchable = False
8080

8181
return res
@@ -88,7 +88,7 @@ def variants():
8888

8989
# PowerPC and zSeries are limited resources.
9090
for task in TASKS:
91-
if any(pattern in task.run_on for pattern in ["power8", "zseries"]):
91+
if any(pattern in task.run_on for pattern in ["power", "zseries"]):
9292
tasks.append(
9393
TaskRef(
9494
name=task.name,

‎.evergreen/config_generator/components/scan_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# pylint: disable=line-too-long
1919
# fmt: off
2020
MATRIX = [
21-
('macos-1100', 'clang', None ),
21+
('macos-14', 'clang', None ),
2222
('ubuntu2004-arm64', 'clang', None ),
2323
('ubuntu2004', 'clang', 'i686'),
2424
]

‎.evergreen/config_generator/etc/distros.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Distro(BaseModel):
3232
'vsMulti',
3333
] | None = None
3434
size: Literal['small', 'large'] | None = None
35-
arch: Literal['arm64', 'power8', 'zseries'] | None = None
35+
arch: Literal['arm64', 'power', 'zseries'] | None = None
3636

3737
@validator('os_ver')
3838
@classmethod
@@ -52,11 +52,12 @@ def validate_os_ver(cls, value):
5252
]
5353

5454
MACOS_DISTROS = [
55-
Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'),
55+
Distro(name='macos-14', os='macos', os_type='macos', os_ver='14'),
5656
]
5757

5858
MACOS_ARM64_DISTROS = [
59-
Distro(name='macos-1100-arm64', os='macos', os_type='macos', os_ver='11.00', arch='arm64'),
59+
Distro(name='macos-11-arm64', os='macos', os_type='macos', os_ver='11', arch='arm64'),
60+
Distro(name='macos-14-arm64', os='macos', os_type='macos', os_ver='14', arch='arm64'),
6061
]
6162

6263
RHEL_DISTROS = [
@@ -77,14 +78,18 @@ def validate_os_ver(cls, value):
7778
Distro(name='rhel92-arm64-small', os='rhel', os_type='linux', os_ver='9.0', size='small', arch='arm64'),
7879
]
7980

80-
RHEL_POWER8_DISTROS = [
81-
Distro(name='rhel81-power8-large', os='rhel', os_type='linux', os_ver='8.1', size='large', arch='power8'),
82-
Distro(name='rhel81-power8-small', os='rhel', os_type='linux', os_ver='8.1', size='small', arch='power8'),
81+
RHEL_POWER_DISTROS = [
82+
Distro(name='rhel8-power-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='power'),
83+
Distro(name='rhel8-power-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='power'),
84+
Distro(name='rhel9-power-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='power'),
85+
Distro(name='rhel9-power-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='power'),
8386
]
8487

8588
RHEL_ZSERIES_DISTROS = [
86-
Distro(name='rhel83-zseries-large', os='rhel', os_type='linux', os_ver='8.3', size='large', arch='zseries'),
87-
Distro(name='rhel83-zseries-small', os='rhel', os_type='linux', os_ver='8.3', size='small', arch='zseries'),
89+
Distro(name='rhel8-zseries-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='zseries'),
90+
Distro(name='rhel8-zseries-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='zseries'),
91+
Distro(name='rhel9-zseries-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='zseries'),
92+
Distro(name='rhel9-zseries-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='zseries'),
8893
]
8994

9095
UBUNTU_DISTROS = [
@@ -134,7 +139,7 @@ def validate_os_ver(cls, value):
134139
MACOS_ARM64_DISTROS + \
135140
RHEL_DISTROS + \
136141
RHEL_ARM64_DISTROS + \
137-
RHEL_POWER8_DISTROS + \
142+
RHEL_POWER_DISTROS + \
138143
RHEL_ZSERIES_DISTROS + \
139144
UBUNTU_DISTROS + \
140145
UBUNTU_ARM64_DISTROS + \

‎.evergreen/generated_configs/legacy-config.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16355,10 +16355,10 @@ buildvariants:
1635516355
- link-with-cmake-snappy-deprecated
1635616356
- name: link-with-cmake-mac
1635716357
distros:
16358-
- macos-1100
16358+
- macos-14-arm64
1635916359
- name: link-with-cmake-mac-deprecated
1636016360
distros:
16361-
- macos-1100
16361+
- macos-14-arm64
1636216362
- name: link-with-cmake-windows
1636316363
distros:
1636416364
- windows-vsCurrent-large
@@ -16376,15 +16376,15 @@ buildvariants:
1637616376
- ubuntu2004-test
1637716377
- name: link-with-pkg-config-mac
1637816378
distros:
16379-
- macos-1100
16379+
- macos-14-arm64
1638016380
- link-with-pkg-config-ssl
1638116381
- link-with-bson
1638216382
- name: link-with-bson-windows
1638316383
distros:
1638416384
- windows-vsCurrent-large
1638516385
- name: link-with-bson-mac
1638616386
distros:
16387-
- macos-1100
16387+
- macos-14-arm64
1638816388
- name: link-with-bson-mingw
1638916389
distros:
1639016390
- windows-vsCurrent-large
@@ -16522,12 +16522,11 @@ buildvariants:
1652216522
display_name: '*Darwin, macOS (Apple LLVM)'
1652316523
expansions:
1652416524
CC: clang
16525-
run_on: macos-1100
16525+
run_on: macos-14-arm64
1652616526
tasks:
1652716527
- .compression !.snappy
1652816528
- release-compile
1652916529
- debug-compile-nosasl-nossl
16530-
- debug-compile-rdtscp
1653116530
- debug-compile-no-align
1653216531
- debug-compile-nosrv
1653316532
- debug-compile-sasl-darwinssl
@@ -16539,8 +16538,16 @@ buildvariants:
1653916538
- debug-compile-lto
1654016539
- debug-compile-lto-thin
1654116540
- debug-compile-aws
16542-
- test-aws-openssl-regular-4.4
1654316541
- test-aws-openssl-regular-latest
16542+
- name: darwin-intel
16543+
display_name: '*Darwin, Intel macOS (Apple LLVM)'
16544+
expansions:
16545+
CC: clang
16546+
run_on: macos-14
16547+
tasks:
16548+
- debug-compile-aws
16549+
- debug-compile-rdtscp
16550+
- test-aws-openssl-regular-4.4
1654416551
- name: windows-2017-32
1654516552
display_name: Windows (i686) (VS 2017)
1654616553
expansions:
@@ -16605,11 +16612,11 @@ buildvariants:
1660516612
run_on: windows-vsCurrent-large
1660616613
tasks:
1660716614
- debug-compile-no-align
16608-
- name: power8-rhel81
16609-
display_name: Power8 (ppc64le) (RHEL 8.1)
16615+
- name: rhel8-power
16616+
display_name: Power (ppc64le) (RHEL 8)
1661016617
expansions:
1661116618
CC: gcc
16612-
run_on: rhel81-power8-test
16619+
run_on: rhel8-power-large
1661316620
tasks:
1661416621
- release-compile
1661516622
- debug-compile-nosasl-nossl
@@ -16634,11 +16641,11 @@ buildvariants:
1663416641
- .latest .nossl
1663516642
- test-dns-openssl
1663616643
batchtime: 1440
16637-
- name: zseries-rhel83
16644+
- name: zseries-rhel8
1663816645
display_name: '*zSeries'
1663916646
expansions:
1664016647
CC: gcc
16641-
run_on: rhel83-zseries-small
16648+
run_on: rhel8-zseries-large
1664216649
tasks:
1664316650
- release-compile
1664416651
- debug-compile-no-align
@@ -16691,14 +16698,14 @@ buildvariants:
1669116698
- name: debug-compile-nosasl-openssl-static
1669216699
- name: debug-compile-nosasl-darwinssl
1669316700
distros:
16694-
- macos-1100
16701+
- macos-14-arm64
1669516702
- name: debug-compile-nosasl-winssl
1669616703
distros:
1669716704
- windows-vsCurrent-large
1669816705
- name: .ocsp-openssl
1669916706
- name: .ocsp-darwinssl
1670016707
distros:
16701-
- macos-1100
16708+
- macos-14-arm64
1670216709
- name: .ocsp-winssl
1670316710
distros:
1670416711
- windows-vsCurrent-large

0 commit comments

Comments
 (0)