Skip to content

Commit bfec2ae

Browse files
NoahStappNoahStapp
authored
Merge branch 'master' into PYTHON-4947 
2 parents 370ba42 + 53c4694 commit bfec2ae

File tree

88 files changed

+3699
-1784
lines changed

Some content is hidden

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

88 files changed

+3699
-1784
lines changed

‎.evergreen/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ functions:
206206
params:
207207
binary: bash
208208
working_dir: "src"
209-
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY,
209+
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION,
210210
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER]
211211
args: [.evergreen/just.sh, run-server, "${TEST_NAME}"]
212212
- command: expansions.update
@@ -227,7 +227,7 @@ functions:
227227
type: test
228228
params:
229229
include_expansions_in_env: [AUTH, SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
230-
AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI,
230+
AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION,
231231
DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION, DEBUG_LOG,
232232
ORCHESTRATION_FILE, OCSP_SERVER_TYPE]
233233
binary: bash

‎.evergreen/generated_configs/tasks.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,18 +723,48 @@ tasks:
723723
tags: [doctests]
724724

725725
# Enterprise auth tests
726-
- name: test-enterprise-auth
726+
- name: test-enterprise-auth-python3.9
727727
commands:
728728
- func: run server
729729
vars:
730730
TEST_NAME: enterprise_auth
731731
AUTH: auth
732+
PYTHON_VERSION: "3.9"
732733
- func: assume ec2 role
733734
- func: run tests
734735
vars:
735736
TEST_NAME: enterprise_auth
736737
AUTH: auth
738+
PYTHON_VERSION: "3.9"
737739
tags: [enterprise_auth]
740+
- name: test-enterprise-auth-python3.13
741+
commands:
742+
- func: run server
743+
vars:
744+
TEST_NAME: enterprise_auth
745+
AUTH: auth
746+
PYTHON_VERSION: "3.13"
747+
- func: assume ec2 role
748+
- func: run tests
749+
vars:
750+
TEST_NAME: enterprise_auth
751+
AUTH: auth
752+
PYTHON_VERSION: "3.13"
753+
tags: [enterprise_auth]
754+
- name: test-enterprise-auth-pypy3.10
755+
commands:
756+
- func: run server
757+
vars:
758+
TEST_NAME: enterprise_auth
759+
AUTH: auth
760+
PYTHON_VERSION: pypy3.10
761+
- func: assume ec2 role
762+
- func: run tests
763+
vars:
764+
TEST_NAME: enterprise_auth
765+
AUTH: auth
766+
PYTHON_VERSION: pypy3.10
767+
tags: [enterprise_auth, pypy]
738768

739769
# Free threading tests
740770
- name: test-free-threading

‎.evergreen/generated_configs/variants.yml

Lines changed: 31 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@ buildvariants:
4545
batchtime: 10080
4646
expansions:
4747
NO_EXT: "1"
48+
- name: other-hosts-amazon2023
49+
tasks:
50+
- name: .latest !.sync_async .sharded_cluster .auth .ssl
51+
- name: .latest !.sync_async .replica_set .noauth .ssl
52+
- name: .latest !.sync_async .standalone .noauth .nossl
53+
display_name: Other hosts Amazon2023
54+
run_on:
55+
- amazon2023-arm64-latest-large-m8g
56+
batchtime: 10080
57+
expansions:
58+
NO_EXT: "1"
4859

4960
# Atlas connect tests
5061
- name: atlas-connect-rhel8-python3.9
@@ -496,54 +507,24 @@ buildvariants:
496507
tags: [encryption_tag]
497508

498509
# Enterprise auth tests
499-
- name: auth-enterprise-macos-python3.9
510+
- name: auth-enterprise-macos
500511
tasks:
501-
- name: .enterprise_auth
502-
display_name: Auth Enterprise macOS Python3.9
512+
- name: .enterprise_auth !.pypy
513+
display_name: Auth Enterprise macOS
503514
run_on:
504515
- macos-14
505-
expansions:
506-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
507-
- name: auth-enterprise-rhel8-python3.10
508-
tasks:
509-
- name: .enterprise_auth
510-
display_name: Auth Enterprise RHEL8 Python3.10
511-
run_on:
512-
- rhel87-small
513-
expansions:
514-
PYTHON_BINARY: /opt/python/3.10/bin/python3
515-
- name: auth-enterprise-rhel8-python3.11
516+
- name: auth-enterprise-win64
516517
tasks:
517-
- name: .enterprise_auth
518-
display_name: Auth Enterprise RHEL8 Python3.11
519-
run_on:
520-
- rhel87-small
521-
expansions:
522-
PYTHON_BINARY: /opt/python/3.11/bin/python3
523-
- name: auth-enterprise-rhel8-python3.12
524-
tasks:
525-
- name: .enterprise_auth
526-
display_name: Auth Enterprise RHEL8 Python3.12
527-
run_on:
528-
- rhel87-small
529-
expansions:
530-
PYTHON_BINARY: /opt/python/3.12/bin/python3
531-
- name: auth-enterprise-win64-python3.13
532-
tasks:
533-
- name: .enterprise_auth
534-
display_name: Auth Enterprise Win64 Python3.13
518+
- name: .enterprise_auth !.pypy
519+
display_name: Auth Enterprise Win64
535520
run_on:
536521
- windows-64-vsMulti-small
537-
expansions:
538-
PYTHON_BINARY: C:/python/Python313/python.exe
539-
- name: auth-enterprise-rhel8-pypy3.10
522+
- name: auth-enterprise-rhel8
540523
tasks:
541524
- name: .enterprise_auth
542-
display_name: Auth Enterprise RHEL8 PyPy3.10
525+
display_name: Auth Enterprise RHEL8
543526
run_on:
544527
- rhel87-small
545-
expansions:
546-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
547528

548529
# Free threaded tests
549530
- name: free-threaded-rhel8-python3.13t
@@ -1246,12 +1227,12 @@ buildvariants:
12461227
# Stable api tests
12471228
- name: stable-api-require-v1-rhel8-python3.9-auth
12481229
tasks:
1249-
- name: .standalone .5.0 .noauth .nossl .sync_async
1250-
- name: .standalone .6.0 .noauth .nossl .sync_async
1251-
- name: .standalone .7.0 .noauth .nossl .sync_async
1252-
- name: .standalone .8.0 .noauth .nossl .sync_async
1253-
- name: .standalone .rapid .noauth .nossl .sync_async
1254-
- name: .standalone .latest .noauth .nossl .sync_async
1230+
- name: "!.replica_set .5.0 .noauth .nossl .sync_async"
1231+
- name: "!.replica_set .6.0 .noauth .nossl .sync_async"
1232+
- name: "!.replica_set .7.0 .noauth .nossl .sync_async"
1233+
- name: "!.replica_set .8.0 .noauth .nossl .sync_async"
1234+
- name: "!.replica_set .rapid .noauth .nossl .sync_async"
1235+
- name: "!.replica_set .latest .noauth .nossl .sync_async"
12551236
display_name: Stable API require v1 RHEL8 Python3.9 Auth
12561237
run_on:
12571238
- rhel87-small
@@ -1279,12 +1260,12 @@ buildvariants:
12791260
tags: [versionedApi_tag]
12801261
- name: stable-api-require-v1-rhel8-python3.13-auth
12811262
tasks:
1282-
- name: .standalone .5.0 .noauth .nossl .sync_async
1283-
- name: .standalone .6.0 .noauth .nossl .sync_async
1284-
- name: .standalone .7.0 .noauth .nossl .sync_async
1285-
- name: .standalone .8.0 .noauth .nossl .sync_async
1286-
- name: .standalone .rapid .noauth .nossl .sync_async
1287-
- name: .standalone .latest .noauth .nossl .sync_async
1263+
- name: "!.replica_set .5.0 .noauth .nossl .sync_async"
1264+
- name: "!.replica_set .6.0 .noauth .nossl .sync_async"
1265+
- name: "!.replica_set .7.0 .noauth .nossl .sync_async"
1266+
- name: "!.replica_set .8.0 .noauth .nossl .sync_async"
1267+
- name: "!.replica_set .rapid .noauth .nossl .sync_async"
1268+
- name: "!.replica_set .latest .noauth .nossl .sync_async"
12881269
display_name: Stable API require v1 RHEL8 Python3.13 Auth
12891270
run_on:
12901271
- rhel87-small

‎.evergreen/run-tests.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ else
2424
exit 1
2525
fi
2626

27-
# Source the local secrets export file if available.
28-
if [ -f "./secrets-export.sh" ]; then
29-
echo "Sourcing local secrets file"
30-
. "./secrets-export.sh"
31-
fi
32-
3327
# List the packages.
3428
uv sync ${UV_ARGS} --reinstall
3529
uv pip list

‎.evergreen/scripts/generate-config.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
# Entry point for the generate-config pre-commit hook.
3+
4+
set -eu
5+
6+
python .evergreen/scripts/generate_config.py

0 commit comments

Comments
 (0)