Skip to content

Commit 88b080e

Browse files
blink1073blink1073
committed
PYTHON-5372 Convert Remaining Variants to Use Common Tasks
1 parent f118492 commit 88b080e

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3822,6 +3822,7 @@ tasks:
38223822
- server-4.0
38233823
- python-3.9
38243824
- standalone-noauth-nossl
3825+
- noauth
38253826
- name: test-non-standard-v4.0-python3.10-noauth-ssl-replica-set
38263827
commands:
38273828
- func: run server
@@ -3842,6 +3843,7 @@ tasks:
38423843
- server-4.0
38433844
- python-3.10
38443845
- replica_set-noauth-ssl
3846+
- noauth
38453847
- name: test-non-standard-v4.0-python3.11-auth-ssl-sharded-cluster
38463848
commands:
38473849
- func: run server
@@ -3862,6 +3864,7 @@ tasks:
38623864
- server-4.0
38633865
- python-3.11
38643866
- sharded_cluster-auth-ssl
3867+
- auth
38653868
- name: test-non-standard-v4.2-python3.12-noauth-nossl-standalone
38663869
commands:
38673870
- func: run server
@@ -3882,6 +3885,7 @@ tasks:
38823885
- server-4.2
38833886
- python-3.12
38843887
- standalone-noauth-nossl
3888+
- noauth
38853889
- name: test-non-standard-v4.2-python3.13-noauth-ssl-replica-set
38863890
commands:
38873891
- func: run server
@@ -3902,6 +3906,7 @@ tasks:
39023906
- server-4.2
39033907
- python-3.13
39043908
- replica_set-noauth-ssl
3909+
- noauth
39053910
- name: test-non-standard-v4.2-python3.9-auth-ssl-sharded-cluster
39063911
commands:
39073912
- func: run server
@@ -3922,6 +3927,7 @@ tasks:
39223927
- server-4.2
39233928
- python-3.9
39243929
- sharded_cluster-auth-ssl
3930+
- auth
39253931
- name: test-non-standard-v4.4-python3.10-noauth-nossl-standalone
39263932
commands:
39273933
- func: run server
@@ -3942,6 +3948,7 @@ tasks:
39423948
- server-4.4
39433949
- python-3.10
39443950
- standalone-noauth-nossl
3951+
- noauth
39453952
- name: test-non-standard-v4.4-python3.11-noauth-ssl-replica-set
39463953
commands:
39473954
- func: run server
@@ -3962,6 +3969,7 @@ tasks:
39623969
- server-4.4
39633970
- python-3.11
39643971
- replica_set-noauth-ssl
3972+
- noauth
39653973
- name: test-non-standard-v4.4-python3.12-auth-ssl-sharded-cluster
39663974
commands:
39673975
- func: run server
@@ -3982,6 +3990,7 @@ tasks:
39823990
- server-4.4
39833991
- python-3.12
39843992
- sharded_cluster-auth-ssl
3993+
- auth
39853994
- name: test-non-standard-v5.0-python3.13-noauth-nossl-standalone
39863995
commands:
39873996
- func: run server
@@ -4002,6 +4011,7 @@ tasks:
40024011
- server-5.0
40034012
- python-3.13
40044013
- standalone-noauth-nossl
4014+
- noauth
40054015
- name: test-non-standard-v5.0-python3.9-noauth-ssl-replica-set
40064016
commands:
40074017
- func: run server
@@ -4022,6 +4032,7 @@ tasks:
40224032
- server-5.0
40234033
- python-3.9
40244034
- replica_set-noauth-ssl
4035+
- noauth
40254036
- name: test-non-standard-v5.0-python3.10-auth-ssl-sharded-cluster
40264037
commands:
40274038
- func: run server
@@ -4042,6 +4053,7 @@ tasks:
40424053
- server-5.0
40434054
- python-3.10
40444055
- sharded_cluster-auth-ssl
4056+
- auth
40454057
- name: test-non-standard-v6.0-python3.11-noauth-nossl-standalone
40464058
commands:
40474059
- func: run server
@@ -4062,6 +4074,7 @@ tasks:
40624074
- server-6.0
40634075
- python-3.11
40644076
- standalone-noauth-nossl
4077+
- noauth
40654078
- name: test-non-standard-v6.0-python3.12-noauth-ssl-replica-set
40664079
commands:
40674080
- func: run server
@@ -4082,6 +4095,7 @@ tasks:
40824095
- server-6.0
40834096
- python-3.12
40844097
- replica_set-noauth-ssl
4098+
- noauth
40854099
- name: test-non-standard-v6.0-python3.13-auth-ssl-sharded-cluster
40864100
commands:
40874101
- func: run server
@@ -4102,6 +4116,7 @@ tasks:
41024116
- server-6.0
41034117
- python-3.13
41044118
- sharded_cluster-auth-ssl
4119+
- auth
41054120
- name: test-non-standard-v7.0-python3.9-noauth-nossl-standalone
41064121
commands:
41074122
- func: run server
@@ -4122,6 +4137,7 @@ tasks:
41224137
- server-7.0
41234138
- python-3.9
41244139
- standalone-noauth-nossl
4140+
- noauth
41254141
- name: test-non-standard-v7.0-python3.10-noauth-ssl-replica-set
41264142
commands:
41274143
- func: run server
@@ -4142,6 +4158,7 @@ tasks:
41424158
- server-7.0
41434159
- python-3.10
41444160
- replica_set-noauth-ssl
4161+
- noauth
41454162
- name: test-non-standard-v7.0-python3.11-auth-ssl-sharded-cluster
41464163
commands:
41474164
- func: run server
@@ -4162,6 +4179,7 @@ tasks:
41624179
- server-7.0
41634180
- python-3.11
41644181
- sharded_cluster-auth-ssl
4182+
- auth
41654183
- name: test-non-standard-v8.0-python3.12-noauth-nossl-standalone
41664184
commands:
41674185
- func: run server
@@ -4182,6 +4200,7 @@ tasks:
41824200
- server-8.0
41834201
- python-3.12
41844202
- standalone-noauth-nossl
4203+
- noauth
41854204
- name: test-non-standard-v8.0-python3.13-noauth-ssl-replica-set
41864205
commands:
41874206
- func: run server
@@ -4202,6 +4221,7 @@ tasks:
42024221
- server-8.0
42034222
- python-3.13
42044223
- replica_set-noauth-ssl
4224+
- noauth
42054225
- name: test-non-standard-v8.0-python3.9-auth-ssl-sharded-cluster
42064226
commands:
42074227
- func: run server
@@ -4222,6 +4242,7 @@ tasks:
42224242
- server-8.0
42234243
- python-3.9
42244244
- sharded_cluster-auth-ssl
4245+
- auth
42254246
- name: test-non-standard-rapid-python3.10-noauth-nossl-standalone
42264247
commands:
42274248
- func: run server
@@ -4242,6 +4263,7 @@ tasks:
42424263
- server-rapid
42434264
- python-3.10
42444265
- standalone-noauth-nossl
4266+
- noauth
42454267
- name: test-non-standard-rapid-python3.11-noauth-ssl-replica-set
42464268
commands:
42474269
- func: run server
@@ -4262,6 +4284,7 @@ tasks:
42624284
- server-rapid
42634285
- python-3.11
42644286
- replica_set-noauth-ssl
4287+
- noauth
42654288
- name: test-non-standard-rapid-python3.12-auth-ssl-sharded-cluster
42664289
commands:
42674290
- func: run server
@@ -4282,6 +4305,7 @@ tasks:
42824305
- server-rapid
42834306
- python-3.12
42844307
- sharded_cluster-auth-ssl
4308+
- auth
42854309
- name: test-non-standard-latest-python3.13-noauth-nossl-standalone
42864310
commands:
42874311
- func: run server
@@ -4302,6 +4326,7 @@ tasks:
43024326
- server-latest
43034327
- python-3.13
43044328
- standalone-noauth-nossl
4329+
- noauth
43054330
- name: test-non-standard-latest-python3.9-noauth-ssl-replica-set
43064331
commands:
43074332
- func: run server
@@ -4322,6 +4347,7 @@ tasks:
43224347
- server-latest
43234348
- python-3.9
43244349
- replica_set-noauth-ssl
4350+
- noauth
43254351
- name: test-non-standard-latest-python3.10-auth-ssl-sharded-cluster
43264352
commands:
43274353
- func: run server
@@ -4342,6 +4368,7 @@ tasks:
43424368
- server-latest
43434369
- python-3.10
43444370
- sharded_cluster-auth-ssl
4371+
- auth
43454372
- name: test-non-standard-v4.0-pypy3.10-noauth-nossl-standalone
43464373
commands:
43474374
- func: run server
@@ -4362,6 +4389,7 @@ tasks:
43624389
- server-4.0
43634390
- python-pypy3.10
43644391
- standalone-noauth-nossl
4392+
- noauth
43654393
- pypy
43664394
- name: test-non-standard-v4.2-pypy3.10-noauth-ssl-replica-set
43674395
commands:
@@ -4383,6 +4411,7 @@ tasks:
43834411
- server-4.2
43844412
- python-pypy3.10
43854413
- replica_set-noauth-ssl
4414+
- noauth
43864415
- pypy
43874416
- name: test-non-standard-v4.4-pypy3.10-auth-ssl-sharded-cluster
43884417
commands:
@@ -4404,6 +4433,7 @@ tasks:
44044433
- server-4.4
44054434
- python-pypy3.10
44064435
- sharded_cluster-auth-ssl
4436+
- auth
44074437
- pypy
44084438
- name: test-non-standard-v5.0-pypy3.10-noauth-nossl-standalone
44094439
commands:
@@ -4425,6 +4455,7 @@ tasks:
44254455
- server-5.0
44264456
- python-pypy3.10
44274457
- standalone-noauth-nossl
4458+
- noauth
44284459
- pypy
44294460
- name: test-non-standard-v6.0-pypy3.10-noauth-ssl-replica-set
44304461
commands:
@@ -4446,6 +4477,7 @@ tasks:
44464477
- server-6.0
44474478
- python-pypy3.10
44484479
- replica_set-noauth-ssl
4480+
- noauth
44494481
- pypy
44504482
- name: test-non-standard-v7.0-pypy3.10-auth-ssl-sharded-cluster
44514483
commands:
@@ -4467,6 +4499,7 @@ tasks:
44674499
- server-7.0
44684500
- python-pypy3.10
44694501
- sharded_cluster-auth-ssl
4502+
- auth
44704503
- pypy
44714504
- name: test-non-standard-v8.0-pypy3.10-noauth-nossl-standalone
44724505
commands:
@@ -4488,6 +4521,7 @@ tasks:
44884521
- server-8.0
44894522
- python-pypy3.10
44904523
- standalone-noauth-nossl
4524+
- noauth
44914525
- pypy
44924526
- name: test-non-standard-rapid-pypy3.10-noauth-ssl-replica-set
44934527
commands:
@@ -4509,6 +4543,7 @@ tasks:
45094543
- server-rapid
45104544
- python-pypy3.10
45114545
- replica_set-noauth-ssl
4546+
- noauth
45124547
- pypy
45134548
- name: test-non-standard-latest-pypy3.10-auth-ssl-sharded-cluster
45144549
commands:
@@ -4530,4 +4565,5 @@ tasks:
45304565
- server-latest
45314566
- python-pypy3.10
45324567
- sharded_cluster-auth-ssl
4568+
- auth
45334569
- pypy

‎.evergreen/generated_configs/variants.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ buildvariants:
262262
AUTH: auth
263263
- name: auth-enterprise-macos
264264
tasks:
265-
- name: .test-non-standard !.pypy
265+
- name: .test-non-standard !.pypy .auth
266266
display_name: Auth Enterprise macOS
267267
run_on:
268268
- macos-14
@@ -271,7 +271,7 @@ buildvariants:
271271
AUTH: auth
272272
- name: auth-enterprise-win64
273273
tasks:
274-
- name: .test-non-standard !.pypy
274+
- name: .test-non-standard !.pypy .auth
275275
display_name: Auth Enterprise Win64
276276
run_on:
277277
- windows-64-vsMulti-small

‎.evergreen/scripts/generate_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def create_enterprise_auth_variants():
216216
display_name = get_variant_name("Auth Enterprise", host)
217217
tasks = [".test-non-standard"]
218218
if host != "rhel8":
219-
tasks = [".test-non-standard !.pypy"]
219+
tasks = [".test-non-standard !.pypy .auth"]
220220
variant = create_variant(tasks, display_name, host=host, expansions=expansions)
221221
variants.append(variant)
222222
return variants
@@ -618,6 +618,7 @@ def create_test_non_standard_tasks():
618618
f"server-{version}",
619619
f"python-{python}",
620620
f"{topology}-{auth}-{ssl}",
621+
auth,
621622
]
622623
if python in PYPYS:
623624
tags.append("pypy")

0 commit comments

Comments
 (0)