Skip to content

Commit 04447c8

Browse files
ShaneHarveyShaneHarvey
committed
Merge branch 'master' into PYTHON-5120 
2 parents 751ccae + eaae22c commit 04447c8

File tree

148 files changed

+10442
-2148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+10442
-2148
lines changed

‎.evergreen/config.yml‎

Lines changed: 26 additions & 230 deletions
Large diffs are not rendered by default.

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 706 additions & 222 deletions
Large diffs are not rendered by default.

‎.evergreen/generated_configs/variants.yml‎

Lines changed: 85 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ buildvariants:
318318
- rhel87-small
319319
batchtime: 10080
320320
expansions:
321-
test_encryption: "true"
321+
TEST_NAME: encryption
322322
PYTHON_BINARY: /opt/python/3.9/bin/python3
323323
tags: [encryption_tag]
324324
- name: encryption-rhel8-python3.13
@@ -331,7 +331,7 @@ buildvariants:
331331
- rhel87-small
332332
batchtime: 10080
333333
expansions:
334-
test_encryption: "true"
334+
TEST_NAME: encryption
335335
PYTHON_BINARY: /opt/python/3.13/bin/python3
336336
tags: [encryption_tag]
337337
- name: encryption-rhel8-pypy3.10
@@ -344,7 +344,7 @@ buildvariants:
344344
- rhel87-small
345345
batchtime: 10080
346346
expansions:
347-
test_encryption: "true"
347+
TEST_NAME: encryption
348348
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
349349
tags: [encryption_tag]
350350
- name: encryption-crypt_shared-rhel8-python3.9
@@ -357,8 +357,8 @@ buildvariants:
357357
- rhel87-small
358358
batchtime: 10080
359359
expansions:
360-
test_encryption: "true"
361-
test_crypt_shared: "true"
360+
TEST_NAME: encryption
361+
TEST_CRYPT_SHARED: "true"
362362
PYTHON_BINARY: /opt/python/3.9/bin/python3
363363
tags: [encryption_tag]
364364
- name: encryption-crypt_shared-rhel8-python3.13
@@ -371,8 +371,8 @@ buildvariants:
371371
- rhel87-small
372372
batchtime: 10080
373373
expansions:
374-
test_encryption: "true"
375-
test_crypt_shared: "true"
374+
TEST_NAME: encryption
375+
TEST_CRYPT_SHARED: "true"
376376
PYTHON_BINARY: /opt/python/3.13/bin/python3
377377
tags: [encryption_tag]
378378
- name: encryption-crypt_shared-rhel8-pypy3.10
@@ -385,8 +385,8 @@ buildvariants:
385385
- rhel87-small
386386
batchtime: 10080
387387
expansions:
388-
test_encryption: "true"
389-
test_crypt_shared: "true"
388+
TEST_NAME: encryption
389+
TEST_CRYPT_SHARED: "true"
390390
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
391391
tags: [encryption_tag]
392392
- name: encryption-pyopenssl-rhel8-python3.9
@@ -399,8 +399,8 @@ buildvariants:
399399
- rhel87-small
400400
batchtime: 10080
401401
expansions:
402-
test_encryption: "true"
403-
test_encryption_pyopenssl: "true"
402+
TEST_NAME: encryption
403+
SUB_TEST_NAME: pyopenssl
404404
PYTHON_BINARY: /opt/python/3.9/bin/python3
405405
tags: [encryption_tag]
406406
- name: encryption-pyopenssl-rhel8-python3.13
@@ -413,8 +413,8 @@ buildvariants:
413413
- rhel87-small
414414
batchtime: 10080
415415
expansions:
416-
test_encryption: "true"
417-
test_encryption_pyopenssl: "true"
416+
TEST_NAME: encryption
417+
SUB_TEST_NAME: pyopenssl
418418
PYTHON_BINARY: /opt/python/3.13/bin/python3
419419
tags: [encryption_tag]
420420
- name: encryption-pyopenssl-rhel8-pypy3.10
@@ -427,8 +427,8 @@ buildvariants:
427427
- rhel87-small
428428
batchtime: 10080
429429
expansions:
430-
test_encryption: "true"
431-
test_encryption_pyopenssl: "true"
430+
TEST_NAME: encryption
431+
SUB_TEST_NAME: pyopenssl
432432
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
433433
tags: [encryption_tag]
434434
- name: encryption-rhel8-python3.10
@@ -438,7 +438,7 @@ buildvariants:
438438
run_on:
439439
- rhel87-small
440440
expansions:
441-
test_encryption: "true"
441+
TEST_NAME: encryption
442442
PYTHON_BINARY: /opt/python/3.10/bin/python3
443443
- name: encryption-crypt_shared-rhel8-python3.11
444444
tasks:
@@ -447,8 +447,8 @@ buildvariants:
447447
run_on:
448448
- rhel87-small
449449
expansions:
450-
test_encryption: "true"
451-
test_crypt_shared: "true"
450+
TEST_NAME: encryption
451+
TEST_CRYPT_SHARED: "true"
452452
PYTHON_BINARY: /opt/python/3.11/bin/python3
453453
- name: encryption-pyopenssl-rhel8-python3.12
454454
tasks:
@@ -457,8 +457,8 @@ buildvariants:
457457
run_on:
458458
- rhel87-small
459459
expansions:
460-
test_encryption: "true"
461-
test_encryption_pyopenssl: "true"
460+
TEST_NAME: encryption
461+
SUB_TEST_NAME: pyopenssl
462462
PYTHON_BINARY: /opt/python/3.12/bin/python3
463463
- name: encryption-macos-python3.9
464464
tasks:
@@ -468,7 +468,7 @@ buildvariants:
468468
- macos-14
469469
batchtime: 10080
470470
expansions:
471-
test_encryption: "true"
471+
TEST_NAME: encryption
472472
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
473473
tags: [encryption_tag]
474474
- name: encryption-macos-python3.13
@@ -479,7 +479,7 @@ buildvariants:
479479
- macos-14
480480
batchtime: 10080
481481
expansions:
482-
test_encryption: "true"
482+
TEST_NAME: encryption
483483
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
484484
tags: [encryption_tag]
485485
- name: encryption-crypt_shared-macos-python3.9
@@ -490,8 +490,8 @@ buildvariants:
490490
- macos-14
491491
batchtime: 10080
492492
expansions:
493-
test_encryption: "true"
494-
test_crypt_shared: "true"
493+
TEST_NAME: encryption
494+
TEST_CRYPT_SHARED: "true"
495495
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
496496
tags: [encryption_tag]
497497
- name: encryption-crypt_shared-macos-python3.13
@@ -502,8 +502,8 @@ buildvariants:
502502
- macos-14
503503
batchtime: 10080
504504
expansions:
505-
test_encryption: "true"
506-
test_crypt_shared: "true"
505+
TEST_NAME: encryption
506+
TEST_CRYPT_SHARED: "true"
507507
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
508508
tags: [encryption_tag]
509509
- name: encryption-win64-python3.9
@@ -514,7 +514,7 @@ buildvariants:
514514
- windows-64-vsMulti-small
515515
batchtime: 10080
516516
expansions:
517-
test_encryption: "true"
517+
TEST_NAME: encryption
518518
PYTHON_BINARY: C:/python/Python39/python.exe
519519
tags: [encryption_tag]
520520
- name: encryption-win64-python3.13
@@ -525,7 +525,7 @@ buildvariants:
525525
- windows-64-vsMulti-small
526526
batchtime: 10080
527527
expansions:
528-
test_encryption: "true"
528+
TEST_NAME: encryption
529529
PYTHON_BINARY: C:/python/Python313/python.exe
530530
tags: [encryption_tag]
531531
- name: encryption-crypt_shared-win64-python3.9
@@ -536,8 +536,8 @@ buildvariants:
536536
- windows-64-vsMulti-small
537537
batchtime: 10080
538538
expansions:
539-
test_encryption: "true"
540-
test_crypt_shared: "true"
539+
TEST_NAME: encryption
540+
TEST_CRYPT_SHARED: "true"
541541
PYTHON_BINARY: C:/python/Python39/python.exe
542542
tags: [encryption_tag]
543543
- name: encryption-crypt_shared-win64-python3.13
@@ -548,8 +548,8 @@ buildvariants:
548548
- windows-64-vsMulti-small
549549
batchtime: 10080
550550
expansions:
551-
test_encryption: "true"
552-
test_crypt_shared: "true"
551+
TEST_NAME: encryption
552+
TEST_CRYPT_SHARED: "true"
553553
PYTHON_BINARY: C:/python/Python313/python.exe
554554
tags: [encryption_tag]
555555

@@ -772,7 +772,7 @@ buildvariants:
772772
# No c ext tests
773773
- name: no-c-ext-rhel8-python3.9
774774
tasks:
775-
- name: .standalone .noauth .nossl .sync_async
775+
- name: .standalone .noauth .nossl !.sync_async
776776
display_name: No C Ext RHEL8 Python3.9
777777
run_on:
778778
- rhel87-small
@@ -781,7 +781,7 @@ buildvariants:
781781
PYTHON_BINARY: /opt/python/3.9/bin/python3
782782
- name: no-c-ext-rhel8-python3.10
783783
tasks:
784-
- name: .replica_set .noauth .nossl .sync_async
784+
- name: .replica_set .noauth .nossl !.sync_async
785785
display_name: No C Ext RHEL8 Python3.10
786786
run_on:
787787
- rhel87-small
@@ -790,7 +790,7 @@ buildvariants:
790790
PYTHON_BINARY: /opt/python/3.10/bin/python3
791791
- name: no-c-ext-rhel8-python3.11
792792
tasks:
793-
- name: .sharded_cluster .noauth .nossl .sync_async
793+
- name: .sharded_cluster .noauth .nossl !.sync_async
794794
display_name: No C Ext RHEL8 Python3.11
795795
run_on:
796796
- rhel87-small
@@ -799,7 +799,7 @@ buildvariants:
799799
PYTHON_BINARY: /opt/python/3.11/bin/python3
800800
- name: no-c-ext-rhel8-python3.12
801801
tasks:
802-
- name: .standalone .noauth .nossl .sync_async
802+
- name: .standalone .noauth .nossl !.sync_async
803803
display_name: No C Ext RHEL8 Python3.12
804804
run_on:
805805
- rhel87-small
@@ -808,7 +808,7 @@ buildvariants:
808808
PYTHON_BINARY: /opt/python/3.12/bin/python3
809809
- name: no-c-ext-rhel8-python3.13
810810
tasks:
811-
- name: .replica_set .noauth .nossl .sync_async
811+
- name: .replica_set .noauth .nossl !.sync_async
812812
display_name: No C Ext RHEL8 Python3.13
813813
run_on:
814814
- rhel87-small
@@ -997,7 +997,7 @@ buildvariants:
997997
- macos-14
998998
batchtime: 10080
999999
expansions:
1000-
test_pyopenssl: "true"
1000+
TEST_NAME: pyopenssl
10011001
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
10021002
- name: pyopenssl-rhel8-python3.10
10031003
tasks:
@@ -1008,7 +1008,7 @@ buildvariants:
10081008
- rhel87-small
10091009
batchtime: 10080
10101010
expansions:
1011-
test_pyopenssl: "true"
1011+
TEST_NAME: pyopenssl
10121012
PYTHON_BINARY: /opt/python/3.10/bin/python3
10131013
- name: pyopenssl-rhel8-python3.11
10141014
tasks:
@@ -1019,7 +1019,7 @@ buildvariants:
10191019
- rhel87-small
10201020
batchtime: 10080
10211021
expansions:
1022-
test_pyopenssl: "true"
1022+
TEST_NAME: pyopenssl
10231023
PYTHON_BINARY: /opt/python/3.11/bin/python3
10241024
- name: pyopenssl-rhel8-python3.12
10251025
tasks:
@@ -1030,7 +1030,7 @@ buildvariants:
10301030
- rhel87-small
10311031
batchtime: 10080
10321032
expansions:
1033-
test_pyopenssl: "true"
1033+
TEST_NAME: pyopenssl
10341034
PYTHON_BINARY: /opt/python/3.12/bin/python3
10351035
- name: pyopenssl-win64-python3.13
10361036
tasks:
@@ -1041,7 +1041,7 @@ buildvariants:
10411041
- windows-64-vsMulti-small
10421042
batchtime: 10080
10431043
expansions:
1044-
test_pyopenssl: "true"
1044+
TEST_NAME: pyopenssl
10451045
PYTHON_BINARY: C:/python/Python313/python.exe
10461046
- name: pyopenssl-rhel8-pypy3.10
10471047
tasks:
@@ -1052,7 +1052,7 @@ buildvariants:
10521052
- rhel87-small
10531053
batchtime: 10080
10541054
expansions:
1055-
test_pyopenssl: "true"
1055+
TEST_NAME: pyopenssl
10561056
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
10571057

10581058
# Search index tests
@@ -1066,6 +1066,19 @@ buildvariants:
10661066
PYTHON_BINARY: /opt/python/3.9/bin/python3
10671067

10681068
# Server tests
1069+
- name: test-rhel8-python3.9-cov-no-c
1070+
tasks:
1071+
- name: .standalone .sync_async
1072+
- name: .replica_set .sync_async
1073+
- name: .sharded_cluster .sync_async
1074+
display_name: "* Test RHEL8 Python3.9 cov No C"
1075+
run_on:
1076+
- rhel87-small
1077+
expansions:
1078+
COVERAGE: coverage
1079+
NO_EXT: "1"
1080+
PYTHON_BINARY: /opt/python/3.9/bin/python3
1081+
tags: [coverage_tag]
10691082
- name: test-rhel8-python3.9-cov
10701083
tasks:
10711084
- name: .standalone .sync_async
@@ -1078,6 +1091,19 @@ buildvariants:
10781091
COVERAGE: coverage
10791092
PYTHON_BINARY: /opt/python/3.9/bin/python3
10801093
tags: [coverage_tag]
1094+
- name: test-rhel8-python3.13-cov-no-c
1095+
tasks:
1096+
- name: .standalone .sync_async
1097+
- name: .replica_set .sync_async
1098+
- name: .sharded_cluster .sync_async
1099+
display_name: "* Test RHEL8 Python3.13 cov No C"
1100+
run_on:
1101+
- rhel87-small
1102+
expansions:
1103+
COVERAGE: coverage
1104+
NO_EXT: "1"
1105+
PYTHON_BINARY: /opt/python/3.13/bin/python3
1106+
tags: [coverage_tag]
10811107
- name: test-rhel8-python3.13-cov
10821108
tasks:
10831109
- name: .standalone .sync_async
@@ -1090,6 +1116,19 @@ buildvariants:
10901116
COVERAGE: coverage
10911117
PYTHON_BINARY: /opt/python/3.13/bin/python3
10921118
tags: [coverage_tag]
1119+
- name: test-rhel8-pypy3.10-cov-no-c
1120+
tasks:
1121+
- name: .standalone .sync_async
1122+
- name: .replica_set .sync_async
1123+
- name: .sharded_cluster .sync_async
1124+
display_name: "* Test RHEL8 PyPy3.10 cov No C"
1125+
run_on:
1126+
- rhel87-small
1127+
expansions:
1128+
COVERAGE: coverage
1129+
NO_EXT: "1"
1130+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
1131+
tags: [coverage_tag]
10931132
- name: test-rhel8-pypy3.10-cov
10941133
tasks:
10951134
- name: .standalone .sync_async
@@ -1249,7 +1288,7 @@ buildvariants:
12491288
- rhel87-small
12501289
batchtime: 10080
12511290
expansions:
1252-
test_serverless: "true"
1291+
TEST_NAME: serverless
12531292
AUTH: auth
12541293
SSL: ssl
12551294
PYTHON_BINARY: /opt/python/3.9/bin/python3
@@ -1261,7 +1300,7 @@ buildvariants:
12611300
- rhel87-small
12621301
batchtime: 10080
12631302
expansions:
1264-
test_serverless: "true"
1303+
TEST_NAME: serverless
12651304
AUTH: auth
12661305
SSL: ssl
12671306
PYTHON_BINARY: /opt/python/3.13/bin/python3
@@ -1338,6 +1377,7 @@ buildvariants:
13381377
- name: storage-inmemory-rhel8-python3.9
13391378
tasks:
13401379
- name: .standalone .noauth .nossl .4.0 .sync_async
1380+
- name: .standalone .noauth .nossl .4.2 .sync_async
13411381
- name: .standalone .noauth .nossl .4.4 .sync_async
13421382
- name: .standalone .noauth .nossl .5.0 .sync_async
13431383
- name: .standalone .noauth .nossl .6.0 .sync_async

0 commit comments

Comments
 (0)