Skip to content

Commit cd7453f

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

File tree

2 files changed

+15
-324
lines changed

2 files changed

+15
-324
lines changed

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 1 addition & 313 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,28 +2491,6 @@ tasks:
24912491
- standalone-noauth-nossl
24922492
- sync
24932493
- pr
2494-
- name: test-server-version-python3.10-async-noauth-nossl-standalone-cov
2495-
commands:
2496-
- func: run server
2497-
vars:
2498-
AUTH: noauth
2499-
SSL: nossl
2500-
TOPOLOGY: standalone
2501-
COVERAGE: "1"
2502-
- func: run tests
2503-
vars:
2504-
AUTH: noauth
2505-
SSL: nossl
2506-
TOPOLOGY: standalone
2507-
COVERAGE: "1"
2508-
PYTHON_VERSION: "3.10"
2509-
TEST_NAME: default_async
2510-
tags:
2511-
- server-version
2512-
- python-3.10
2513-
- standalone-noauth-nossl
2514-
- async
2515-
- pr
25162494
- name: test-server-version-python3.11-sync-auth-ssl-replica-set-cov
25172495
commands:
25182496
- func: run server
@@ -2616,7 +2594,6 @@ tasks:
26162594
- python-3.9
26172595
- replica_set-noauth-ssl
26182596
- sync
2619-
- pr
26202597
- name: test-server-version-python3.10-async-noauth-ssl-replica-set-cov
26212598
commands:
26222599
- func: run server
@@ -2638,7 +2615,6 @@ tasks:
26382615
- python-3.10
26392616
- replica_set-noauth-ssl
26402617
- async
2641-
- pr
26422618
- name: test-server-version-python3.11-sync-noauth-nossl-replica-set-cov
26432619
commands:
26442620
- func: run server
@@ -2660,27 +2636,7 @@ tasks:
26602636
- python-3.11
26612637
- replica_set-noauth-nossl
26622638
- sync
2663-
- name: test-server-version-python3.12-async-noauth-nossl-replica-set-cov
2664-
commands:
2665-
- func: run server
2666-
vars:
2667-
AUTH: noauth
2668-
SSL: nossl
2669-
TOPOLOGY: replica_set
2670-
COVERAGE: "1"
2671-
- func: run tests
2672-
vars:
2673-
AUTH: noauth
2674-
SSL: nossl
2675-
TOPOLOGY: replica_set
2676-
COVERAGE: "1"
2677-
PYTHON_VERSION: "3.12"
2678-
TEST_NAME: default_async
2679-
tags:
2680-
- server-version
2681-
- python-3.12
2682-
- replica_set-noauth-nossl
2683-
- async
2639+
- pr
26842640
- name: test-server-version-python3.13-sync-auth-ssl-sharded-cluster-cov
26852641
commands:
26862642
- func: run server
@@ -2703,26 +2659,6 @@ tasks:
27032659
- sharded_cluster-auth-ssl
27042660
- sync
27052661
- pr
2706-
- name: test-server-version-pypy3.10-async-auth-ssl-sharded-cluster
2707-
commands:
2708-
- func: run server
2709-
vars:
2710-
AUTH: auth
2711-
SSL: ssl
2712-
TOPOLOGY: sharded_cluster
2713-
- func: run tests
2714-
vars:
2715-
AUTH: auth
2716-
SSL: ssl
2717-
TOPOLOGY: sharded_cluster
2718-
PYTHON_VERSION: pypy3.10
2719-
TEST_NAME: default_async
2720-
tags:
2721-
- server-version
2722-
- python-pypy3.10
2723-
- sharded_cluster-auth-ssl
2724-
- async
2725-
- pr
27262662
- name: test-server-version-python3.9-sync-auth-nossl-sharded-cluster-cov
27272663
commands:
27282664
- func: run server
@@ -2847,254 +2783,6 @@ tasks:
28472783
- python-pypy3.10
28482784
- sharded_cluster-noauth-nossl
28492785
- async
2850-
- name: test-server-version-python3.9-sync-auth-ssl-sharded-cluster-cov
2851-
commands:
2852-
- func: run server
2853-
vars:
2854-
AUTH: auth
2855-
SSL: ssl
2856-
TOPOLOGY: sharded_cluster
2857-
COVERAGE: "1"
2858-
- func: run tests
2859-
vars:
2860-
AUTH: auth
2861-
SSL: ssl
2862-
TOPOLOGY: sharded_cluster
2863-
COVERAGE: "1"
2864-
PYTHON_VERSION: "3.9"
2865-
TEST_NAME: default_sync
2866-
tags:
2867-
- server-version
2868-
- python-3.9
2869-
- sharded_cluster-auth-ssl
2870-
- sync
2871-
- name: test-server-version-python3.9-async-auth-ssl-sharded-cluster-cov
2872-
commands:
2873-
- func: run server
2874-
vars:
2875-
AUTH: auth
2876-
SSL: ssl
2877-
TOPOLOGY: sharded_cluster
2878-
COVERAGE: "1"
2879-
- func: run tests
2880-
vars:
2881-
AUTH: auth
2882-
SSL: ssl
2883-
TOPOLOGY: sharded_cluster
2884-
COVERAGE: "1"
2885-
PYTHON_VERSION: "3.9"
2886-
TEST_NAME: default_async
2887-
tags:
2888-
- server-version
2889-
- python-3.9
2890-
- sharded_cluster-auth-ssl
2891-
- async
2892-
- name: test-server-version-python3.10-sync-auth-ssl-sharded-cluster-cov
2893-
commands:
2894-
- func: run server
2895-
vars:
2896-
AUTH: auth
2897-
SSL: ssl
2898-
TOPOLOGY: sharded_cluster
2899-
COVERAGE: "1"
2900-
- func: run tests
2901-
vars:
2902-
AUTH: auth
2903-
SSL: ssl
2904-
TOPOLOGY: sharded_cluster
2905-
COVERAGE: "1"
2906-
PYTHON_VERSION: "3.10"
2907-
TEST_NAME: default_sync
2908-
tags:
2909-
- server-version
2910-
- python-3.10
2911-
- sharded_cluster-auth-ssl
2912-
- sync
2913-
- name: test-server-version-python3.10-async-auth-ssl-sharded-cluster-cov
2914-
commands:
2915-
- func: run server
2916-
vars:
2917-
AUTH: auth
2918-
SSL: ssl
2919-
TOPOLOGY: sharded_cluster
2920-
COVERAGE: "1"
2921-
- func: run tests
2922-
vars:
2923-
AUTH: auth
2924-
SSL: ssl
2925-
TOPOLOGY: sharded_cluster
2926-
COVERAGE: "1"
2927-
PYTHON_VERSION: "3.10"
2928-
TEST_NAME: default_async
2929-
tags:
2930-
- server-version
2931-
- python-3.10
2932-
- sharded_cluster-auth-ssl
2933-
- async
2934-
- name: test-server-version-python3.11-sync-auth-ssl-sharded-cluster-cov
2935-
commands:
2936-
- func: run server
2937-
vars:
2938-
AUTH: auth
2939-
SSL: ssl
2940-
TOPOLOGY: sharded_cluster
2941-
COVERAGE: "1"
2942-
- func: run tests
2943-
vars:
2944-
AUTH: auth
2945-
SSL: ssl
2946-
TOPOLOGY: sharded_cluster
2947-
COVERAGE: "1"
2948-
PYTHON_VERSION: "3.11"
2949-
TEST_NAME: default_sync
2950-
tags:
2951-
- server-version
2952-
- python-3.11
2953-
- sharded_cluster-auth-ssl
2954-
- sync
2955-
- name: test-server-version-python3.11-async-auth-ssl-sharded-cluster-cov
2956-
commands:
2957-
- func: run server
2958-
vars:
2959-
AUTH: auth
2960-
SSL: ssl
2961-
TOPOLOGY: sharded_cluster
2962-
COVERAGE: "1"
2963-
- func: run tests
2964-
vars:
2965-
AUTH: auth
2966-
SSL: ssl
2967-
TOPOLOGY: sharded_cluster
2968-
COVERAGE: "1"
2969-
PYTHON_VERSION: "3.11"
2970-
TEST_NAME: default_async
2971-
tags:
2972-
- server-version
2973-
- python-3.11
2974-
- sharded_cluster-auth-ssl
2975-
- async
2976-
- name: test-server-version-python3.12-sync-auth-ssl-sharded-cluster-cov
2977-
commands:
2978-
- func: run server
2979-
vars:
2980-
AUTH: auth
2981-
SSL: ssl
2982-
TOPOLOGY: sharded_cluster
2983-
COVERAGE: "1"
2984-
- func: run tests
2985-
vars:
2986-
AUTH: auth
2987-
SSL: ssl
2988-
TOPOLOGY: sharded_cluster
2989-
COVERAGE: "1"
2990-
PYTHON_VERSION: "3.12"
2991-
TEST_NAME: default_sync
2992-
tags:
2993-
- server-version
2994-
- python-3.12
2995-
- sharded_cluster-auth-ssl
2996-
- sync
2997-
- name: test-server-version-python3.12-async-auth-ssl-sharded-cluster-cov
2998-
commands:
2999-
- func: run server
3000-
vars:
3001-
AUTH: auth
3002-
SSL: ssl
3003-
TOPOLOGY: sharded_cluster
3004-
COVERAGE: "1"
3005-
- func: run tests
3006-
vars:
3007-
AUTH: auth
3008-
SSL: ssl
3009-
TOPOLOGY: sharded_cluster
3010-
COVERAGE: "1"
3011-
PYTHON_VERSION: "3.12"
3012-
TEST_NAME: default_async
3013-
tags:
3014-
- server-version
3015-
- python-3.12
3016-
- sharded_cluster-auth-ssl
3017-
- async
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
3039-
- name: test-server-version-python3.13-async-auth-ssl-sharded-cluster-cov
3040-
commands:
3041-
- func: run server
3042-
vars:
3043-
AUTH: auth
3044-
SSL: ssl
3045-
TOPOLOGY: sharded_cluster
3046-
COVERAGE: "1"
3047-
- func: run tests
3048-
vars:
3049-
AUTH: auth
3050-
SSL: ssl
3051-
TOPOLOGY: sharded_cluster
3052-
COVERAGE: "1"
3053-
PYTHON_VERSION: "3.13"
3054-
TEST_NAME: default_async
3055-
tags:
3056-
- server-version
3057-
- python-3.13
3058-
- sharded_cluster-auth-ssl
3059-
- async
3060-
- name: test-server-version-pypy3.10-sync-auth-ssl-sharded-cluster
3061-
commands:
3062-
- func: run server
3063-
vars:
3064-
AUTH: auth
3065-
SSL: ssl
3066-
TOPOLOGY: sharded_cluster
3067-
- func: run tests
3068-
vars:
3069-
AUTH: auth
3070-
SSL: ssl
3071-
TOPOLOGY: sharded_cluster
3072-
PYTHON_VERSION: pypy3.10
3073-
TEST_NAME: default_sync
3074-
tags:
3075-
- server-version
3076-
- python-pypy3.10
3077-
- sharded_cluster-auth-ssl
3078-
- sync
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
30982786

30992787
# Serverless tests
31002788
- name: test-serverless

‎.evergreen/scripts/generate_config.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -544,24 +544,27 @@ 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-
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))
547+
task_inputs.append((topology, auth, ssl, sync, python))
554548

555549
# Every python should be tested with sharded cluster, auth, ssl, with sync and async.
556550
for python, sync in product(ALL_PYTHONS, SYNCS):
557-
task_input = ("sharded_cluster", "auth", "ssl", sync, python, False)
551+
task_input = ("sharded_cluster", "auth", "ssl", sync, python)
558552
if task_input not in task_inputs:
559553
task_inputs.append(task_input)
560554

561555
# Assemble the tasks.
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:
556+
seen = set()
557+
for topology, auth, ssl, sync, python in task_inputs:
558+
combo = f"{topology}-{auth}-{ssl}"
559+
tags = ["server-version", f"python-{python}", combo, sync]
560+
if combo in seen:
561+
continue
562+
if combo in [
563+
"standalone-noauth-nossl",
564+
"replica_set-noauth-nossl",
565+
"sharded_cluster-auth-ssl",
566+
]:
567+
seen.add(combo)
565568
tags.append("pr")
566569
expansions = dict(AUTH=auth, SSL=ssl, TOPOLOGY=topology)
567570
if python not in PYPYS:

0 commit comments

Comments
 (0)