Skip to content

Commit 6a7e83d

Browse files
authored
PYTHON-4887 Do not test macos arm64 on server versions < 6.0 (mongodb#1947)
1 parent 021a9f7 commit 6a7e83d

File tree

2 files changed

+43
-14
lines changed

2 files changed

+43
-14
lines changed

.evergreen/config.yml

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,76 +2592,100 @@ buildvariants:
25922592
# Server tests for macOS Arm64.
25932593
- name: test-macos-arm64-py3.9-auth-ssl-sync
25942594
tasks:
2595-
- name: .standalone
2595+
- name: .standalone .6.0
2596+
- name: .standalone .7.0
2597+
- name: .standalone .8.0
2598+
- name: .standalone .rapid
2599+
- name: .standalone .latest
25962600
display_name: Test macOS Arm64 py3.9 Auth SSL Sync
25972601
run_on:
25982602
- macos-14-arm64
25992603
expansions:
26002604
AUTH: auth
26012605
SSL: ssl
26022606
TEST_SUITES: default
2603-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26042607
SKIP_CSOT_TESTS: "true"
2608+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26052609
- name: test-macos-arm64-py3.9-auth-ssl-async
26062610
tasks:
2607-
- name: .standalone
2611+
- name: .standalone .6.0
2612+
- name: .standalone .7.0
2613+
- name: .standalone .8.0
2614+
- name: .standalone .rapid
2615+
- name: .standalone .latest
26082616
display_name: Test macOS Arm64 py3.9 Auth SSL Async
26092617
run_on:
26102618
- macos-14-arm64
26112619
expansions:
26122620
AUTH: auth
26132621
SSL: ssl
26142622
TEST_SUITES: default_async
2615-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26162623
SKIP_CSOT_TESTS: "true"
2624+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26172625
- name: test-macos-arm64-py3.13-noauth-ssl-sync
26182626
tasks:
2619-
- name: .replica_set
2627+
- name: .replica_set .6.0
2628+
- name: .replica_set .7.0
2629+
- name: .replica_set .8.0
2630+
- name: .replica_set .rapid
2631+
- name: .replica_set .latest
26202632
display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
26212633
run_on:
26222634
- macos-14-arm64
26232635
expansions:
26242636
AUTH: noauth
26252637
SSL: ssl
26262638
TEST_SUITES: default
2627-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
26282639
SKIP_CSOT_TESTS: "true"
2640+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
26292641
- name: test-macos-arm64-py3.13-noauth-ssl-async
26302642
tasks:
2631-
- name: .replica_set
2643+
- name: .replica_set .6.0
2644+
- name: .replica_set .7.0
2645+
- name: .replica_set .8.0
2646+
- name: .replica_set .rapid
2647+
- name: .replica_set .latest
26322648
display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
26332649
run_on:
26342650
- macos-14-arm64
26352651
expansions:
26362652
AUTH: noauth
26372653
SSL: ssl
26382654
TEST_SUITES: default_async
2639-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
26402655
SKIP_CSOT_TESTS: "true"
2656+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
26412657
- name: test-macos-arm64-py3.9-noauth-nossl-sync
26422658
tasks:
2643-
- name: .sharded_cluster
2659+
- name: .sharded_cluster .6.0
2660+
- name: .sharded_cluster .7.0
2661+
- name: .sharded_cluster .8.0
2662+
- name: .sharded_cluster .rapid
2663+
- name: .sharded_cluster .latest
26442664
display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
26452665
run_on:
26462666
- macos-14-arm64
26472667
expansions:
26482668
AUTH: noauth
26492669
SSL: nossl
26502670
TEST_SUITES: default
2651-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26522671
SKIP_CSOT_TESTS: "true"
2672+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26532673
- name: test-macos-arm64-py3.9-noauth-nossl-async
26542674
tasks:
2655-
- name: .sharded_cluster
2675+
- name: .sharded_cluster .6.0
2676+
- name: .sharded_cluster .7.0
2677+
- name: .sharded_cluster .8.0
2678+
- name: .sharded_cluster .rapid
2679+
- name: .sharded_cluster .latest
26562680
display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Async
26572681
run_on:
26582682
- macos-14-arm64
26592683
expansions:
26602684
AUTH: noauth
26612685
SSL: nossl
26622686
TEST_SUITES: default_async
2663-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26642687
SKIP_CSOT_TESTS: "true"
2688+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
26652689

26662690
# Server tests for Windows.
26672691
- name: test-win64-py3.9-auth-ssl-sync

.evergreen/scripts/generate_config.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
##############
2424

2525
ALL_VERSIONS = ["4.0", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
26+
VERSIONS_6_0_PLUS = ["6.0", "7.0", "8.0", "rapid", "latest"]
2627
CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
2728
PYPYS = ["pypy3.9", "pypy3.10"]
2829
ALL_PYTHONS = CPYTHONS + PYPYS
@@ -239,10 +240,14 @@ def create_server_variants() -> list[BuildVariant]:
239240
zip_cycle(MIN_MAX_PYTHON, AUTH_SSLS, TOPOLOGIES), SYNCS
240241
):
241242
test_suite = "default" if sync == "sync" else "default_async"
243+
tasks = [f".{topology}"]
244+
# MacOS arm64 only works on server versions 6.0+
245+
if host == "macos-arm64":
246+
tasks = [f".{topology} .{version}" for version in VERSIONS_6_0_PLUS]
242247
expansions = dict(AUTH=auth, SSL=ssl, TEST_SUITES=test_suite, SKIP_CSOT_TESTS="true")
243248
display_name = get_display_name("Test", host, python=python, **expansions)
244249
variant = create_variant(
245-
[f".{topology}"],
250+
tasks,
246251
display_name,
247252
python=python,
248253
host=host,
@@ -409,6 +414,6 @@ def create_enterprise_auth_variants():
409414
# Generate Config
410415
##################
411416

412-
variants = create_enterprise_auth_variants()
417+
variants = create_server_variants()
413418
# print(len(variants))
414419
generate_yaml(variants=variants)

0 commit comments

Comments
 (0)