PYTHON-4887 Do not test macos arm64 on server versions < 6.0 (#1947)

This commit is contained in:
Steven Silvester 2024-10-18 10:36:05 -05:00 committed by GitHub
parent 021a9f7524
commit 6a7e83dc95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 14 deletions

View File

@ -2592,7 +2592,11 @@ buildvariants:
# Server tests for macOS Arm64.
- name: test-macos-arm64-py3.9-auth-ssl-sync
tasks:
- name: .standalone
- name: .standalone .6.0
- name: .standalone .7.0
- name: .standalone .8.0
- name: .standalone .rapid
- name: .standalone .latest
display_name: Test macOS Arm64 py3.9 Auth SSL Sync
run_on:
- macos-14-arm64
@ -2600,11 +2604,15 @@ buildvariants:
AUTH: auth
SSL: ssl
TEST_SUITES: default
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
- name: test-macos-arm64-py3.9-auth-ssl-async
tasks:
- name: .standalone
- name: .standalone .6.0
- name: .standalone .7.0
- name: .standalone .8.0
- name: .standalone .rapid
- name: .standalone .latest
display_name: Test macOS Arm64 py3.9 Auth SSL Async
run_on:
- macos-14-arm64
@ -2612,11 +2620,15 @@ buildvariants:
AUTH: auth
SSL: ssl
TEST_SUITES: default_async
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
- name: test-macos-arm64-py3.13-noauth-ssl-sync
tasks:
- name: .replica_set
- name: .replica_set .6.0
- name: .replica_set .7.0
- name: .replica_set .8.0
- name: .replica_set .rapid
- name: .replica_set .latest
display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
run_on:
- macos-14-arm64
@ -2624,11 +2636,15 @@ buildvariants:
AUTH: noauth
SSL: ssl
TEST_SUITES: default
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
- name: test-macos-arm64-py3.13-noauth-ssl-async
tasks:
- name: .replica_set
- name: .replica_set .6.0
- name: .replica_set .7.0
- name: .replica_set .8.0
- name: .replica_set .rapid
- name: .replica_set .latest
display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
run_on:
- macos-14-arm64
@ -2636,11 +2652,15 @@ buildvariants:
AUTH: noauth
SSL: ssl
TEST_SUITES: default_async
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
- name: test-macos-arm64-py3.9-noauth-nossl-sync
tasks:
- name: .sharded_cluster
- name: .sharded_cluster .6.0
- name: .sharded_cluster .7.0
- name: .sharded_cluster .8.0
- name: .sharded_cluster .rapid
- name: .sharded_cluster .latest
display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
run_on:
- macos-14-arm64
@ -2648,11 +2668,15 @@ buildvariants:
AUTH: noauth
SSL: nossl
TEST_SUITES: default
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
- name: test-macos-arm64-py3.9-noauth-nossl-async
tasks:
- name: .sharded_cluster
- name: .sharded_cluster .6.0
- name: .sharded_cluster .7.0
- name: .sharded_cluster .8.0
- name: .sharded_cluster .rapid
- name: .sharded_cluster .latest
display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Async
run_on:
- macos-14-arm64
@ -2660,8 +2684,8 @@ buildvariants:
AUTH: noauth
SSL: nossl
TEST_SUITES: default_async
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
SKIP_CSOT_TESTS: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
# Server tests for Windows.
- name: test-win64-py3.9-auth-ssl-sync

View File

@ -23,6 +23,7 @@ from shrub.v3.shrub_service import ShrubService
##############
ALL_VERSIONS = ["4.0", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"]
VERSIONS_6_0_PLUS = ["6.0", "7.0", "8.0", "rapid", "latest"]
CPYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
PYPYS = ["pypy3.9", "pypy3.10"]
ALL_PYTHONS = CPYTHONS + PYPYS
@ -239,10 +240,14 @@ def create_server_variants() -> list[BuildVariant]:
zip_cycle(MIN_MAX_PYTHON, AUTH_SSLS, TOPOLOGIES), SYNCS
):
test_suite = "default" if sync == "sync" else "default_async"
tasks = [f".{topology}"]
# MacOS arm64 only works on server versions 6.0+
if host == "macos-arm64":
tasks = [f".{topology} .{version}" for version in VERSIONS_6_0_PLUS]
expansions = dict(AUTH=auth, SSL=ssl, TEST_SUITES=test_suite, SKIP_CSOT_TESTS="true")
display_name = get_display_name("Test", host, python=python, **expansions)
variant = create_variant(
[f".{topology}"],
tasks,
display_name,
python=python,
host=host,
@ -409,6 +414,6 @@ def create_enterprise_auth_variants():
# Generate Config
##################
variants = create_enterprise_auth_variants()
variants = create_server_variants()
# print(len(variants))
generate_yaml(variants=variants)