Skip to content

Commit 170a89c

Browse files
blink1073blink1073
committed
reduce variants
1 parent cd64eca commit 170a89c

File tree

2 files changed

+61
-30
lines changed

2 files changed

+61
-30
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,6 @@ tasks:
28682868
- python-3.9
28692869
- sharded_cluster-auth-ssl
28702870
- sync
2871-
- pr
28722871
- name: test-server-version-python3.9-async-auth-ssl-sharded-cluster-cov
28732872
commands:
28742873
- func: run server
@@ -2890,7 +2889,6 @@ tasks:
28902889
- python-3.9
28912890
- sharded_cluster-auth-ssl
28922891
- async
2893-
- pr
28942892
- name: test-server-version-python3.10-sync-auth-ssl-sharded-cluster-cov
28952893
commands:
28962894
- func: run server
@@ -2912,7 +2910,6 @@ tasks:
29122910
- python-3.10
29132911
- sharded_cluster-auth-ssl
29142912
- sync
2915-
- pr
29162913
- name: test-server-version-python3.10-async-auth-ssl-sharded-cluster-cov
29172914
commands:
29182915
- func: run server
@@ -2934,7 +2931,6 @@ tasks:
29342931
- python-3.10
29352932
- sharded_cluster-auth-ssl
29362933
- async
2937-
- pr
29382934
- name: test-server-version-python3.11-sync-auth-ssl-sharded-cluster-cov
29392935
commands:
29402936
- func: run server
@@ -2956,7 +2952,6 @@ tasks:
29562952
- python-3.11
29572953
- sharded_cluster-auth-ssl
29582954
- sync
2959-
- pr
29602955
- name: test-server-version-python3.11-async-auth-ssl-sharded-cluster-cov
29612956
commands:
29622957
- func: run server
@@ -2978,7 +2973,6 @@ tasks:
29782973
- python-3.11
29792974
- sharded_cluster-auth-ssl
29802975
- async
2981-
- pr
29822976
- name: test-server-version-python3.12-sync-auth-ssl-sharded-cluster-cov
29832977
commands:
29842978
- func: run server
@@ -3000,7 +2994,6 @@ tasks:
30002994
- python-3.12
30012995
- sharded_cluster-auth-ssl
30022996
- sync
3003-
- pr
30042997
- name: test-server-version-python3.12-async-auth-ssl-sharded-cluster-cov
30052998
commands:
30062999
- func: run server
@@ -3022,7 +3015,27 @@ tasks:
30223015
- python-3.12
30233016
- sharded_cluster-auth-ssl
30243017
- async
3025-
- pr
3018+
- name: test-server-version-python3.13-sync-auth-ssl-sharded-cluster-cov
3019+
commands:
3020+
- func: run server
3021+
vars:
3022+
AUTH: auth
3023+
SSL: ssl
3024+
TOPOLOGY: sharded_cluster
3025+
COVERAGE: "1"
3026+
- func: run tests
3027+
vars:
3028+
AUTH: auth
3029+
SSL: ssl
3030+
TOPOLOGY: sharded_cluster
3031+
COVERAGE: "1"
3032+
PYTHON_VERSION: "3.13"
3033+
TEST_NAME: default_sync
3034+
tags:
3035+
- server-version
3036+
- python-3.13
3037+
- sharded_cluster-auth-ssl
3038+
- sync
30263039
- name: test-server-version-python3.13-async-auth-ssl-sharded-cluster-cov
30273040
commands:
30283041
- func: run server
@@ -3044,7 +3057,6 @@ tasks:
30443057
- python-3.13
30453058
- sharded_cluster-auth-ssl
30463059
- async
3047-
- pr
30483060
- name: test-server-version-pypy3.10-sync-auth-ssl-sharded-cluster
30493061
commands:
30503062
- func: run server
@@ -3064,7 +3076,25 @@ tasks:
30643076
- python-pypy3.10
30653077
- sharded_cluster-auth-ssl
30663078
- sync
3067-
- pr
3079+
- name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
3080+
commands:
3081+
- func: run server
3082+
vars:
3083+
AUTH: auth
3084+
SSL: ssl
3085+
TOPOLOGY: sharded_cluster
3086+
- func: run tests
3087+
vars:
3088+
AUTH: auth
3089+
SSL: ssl
3090+
TOPOLOGY: sharded_cluster
3091+
PYTHON_VERSION: pypy3.10
3092+
TEST_NAME: default_async
3093+
tags:
3094+
- server-version
3095+
- python-pypy3.10
3096+
- sharded_cluster-auth-ssl
3097+
- async
30683098

30693099
# Serverless tests
30703100
- name: test-serverless
@@ -3881,7 +3911,6 @@ tasks:
38813911
- sharded_cluster-auth-ssl
38823912
- sync
38833913
- pypy
3884-
- pr
38853914

38863915
# Test non standard tests
38873916
- name: test-non-standard-v4.0-python3.9-noauth-nossl-standalone
@@ -4652,4 +4681,3 @@ tasks:
46524681
- sharded_cluster-auth-ssl
46534682
- auth
46544683
- pypy
4655-
- pr

‎.evergreen/scripts/generate_config.py

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -544,23 +544,24 @@ def create_server_version_tasks():
544544
for (topology, auth, ssl, sync), python in zip_cycle(
545545
list(product(TOPOLOGIES, ["auth", "noauth"], ["ssl", "nossl"], SYNCS)), ALL_PYTHONS
546546
):
547-
task_inputs.append((topology, auth, ssl, sync, python))
547+
combo = f"{topology}-{auth}-{ssl}"
548+
pr = combo in [
549+
"standalone-noauth-nossl",
550+
"replica_set-noauth-ssl",
551+
"sharded_cluster-auth-ssl",
552+
]
553+
task_inputs.append((topology, auth, ssl, sync, python, pr))
548554

549555
# Every python should be tested with sharded cluster, auth, ssl, with sync and async.
550556
for python, sync in product(ALL_PYTHONS, SYNCS):
551-
task_input = ("sharded_cluster", "auth", "ssl", sync, python)
557+
task_input = ("sharded_cluster", "auth", "ssl", sync, python, False)
552558
if task_input not in task_inputs:
553559
task_inputs.append(task_input)
554560

555561
# Assemble the tasks.
556-
for topology, auth, ssl, sync, python in task_inputs:
557-
combo = f"{topology}-{auth}-{ssl}"
558-
tags = ["server-version", f"python-{python}", combo, sync]
559-
if combo in [
560-
"standalone-noauth-nossl",
561-
"replica_set-noauth-ssl",
562-
"sharded_cluster-auth-ssl",
563-
]:
562+
for topology, auth, ssl, sync, python, pr in task_inputs:
563+
tags = ["server-version", f"python-{python}", f"{topology}-{auth}-{ssl}", sync]
564+
if pr:
564565
tags.append("pr")
565566
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
566567
if python not in PYPYS:
@@ -600,11 +601,12 @@ def create_test_non_standard_tasks():
600601
task_combos = []
601602
# For each version and topology, rotate through the CPythons.
602603
for (version, topology), python in zip_cycle(list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS):
603-
task_combos.append((version, topology, python))
604+
pr = version == "latest"
605+
task_combos.append((version, topology, python, pr))
604606
# For each PyPy and topology, rotate through the the versions.
605607
for (python, topology), version in zip_cycle(list(product(PYPYS, TOPOLOGIES)), ALL_VERSIONS):
606-
task_combos.append((version, topology, python))
607-
for version, topology, python in task_combos:
608+
task_combos.append((version, topology, python, False))
609+
for version, topology, python, pr in task_combos:
608610
auth, ssl = get_standard_auth_ssl(topology)
609611
tags = [
610612
"test-non-standard",
@@ -615,7 +617,7 @@ def create_test_non_standard_tasks():
615617
]
616618
if python in PYPYS:
617619
tags.append("pypy")
618-
if version == "latest":
620+
if pr:
619621
tags.append("pr")
620622
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
621623
name = get_task_name("test-non-standard", python=python, **expansions)
@@ -635,14 +637,15 @@ def create_standard_tasks():
635637
for (version, topology), python, sync in zip_cycle(
636638
list(product(ALL_VERSIONS, TOPOLOGIES)), CPYTHONS, SYNCS
637639
):
638-
task_combos.append((version, topology, python, sync))
640+
pr = version == "latest"
641+
task_combos.append((version, topology, python, sync, pr))
639642
# For each PyPy and topology, rotate through the the versions and sync/async.
640643
for (python, topology), version, sync in zip_cycle(
641644
list(product(PYPYS, TOPOLOGIES)), ALL_VERSIONS, SYNCS
642645
):
643-
task_combos.append((version, topology, python, sync))
646+
task_combos.append((version, topology, python, sync, False))
644647

645-
for version, topology, python, sync in task_combos:
648+
for version, topology, python, sync, pr in task_combos:
646649
auth, ssl = get_standard_auth_ssl(topology)
647650
tags = [
648651
"test-standard",
@@ -653,7 +656,7 @@ def create_standard_tasks():
653656
]
654657
if python in PYPYS:
655658
tags.append("pypy")
656-
if version == "latest":
659+
if pr:
657660
tags.append("pr")
658661
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology, VERSION=version)
659662
name = get_task_name("test-standard", python=python, sync=sync, **expansions)

0 commit comments

Comments
 (0)