Skip to content

Commit c57e6c8

Browse files
NoahStappNoahStapp
authored
Merge branch 'master' into PYTHON-4946 
2 parents 9c0bc9f + 8675a16 commit c57e6c8

File tree

82 files changed

+2808
-1095
lines changed

Some content is hidden

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

82 files changed

+2808
-1095
lines changed

‎.evergreen/config.yml

Lines changed: 2 additions & 36 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
@@ -350,37 +350,3 @@ tasks:
350350
- mongodb
351351
- mongo-python-driver
352352
- ${github_commit}
353-
354-
buildvariants:
355-
356-
- name: "Coverage Report"
357-
display_name: "Coverage Report"
358-
run_on:
359-
- rhel84-small
360-
tasks:
361-
- name: "coverage-report"
362-
363-
- name: testkms-variant
364-
display_name: "KMS"
365-
run_on:
366-
- debian11-small
367-
tasks:
368-
- name: test-gcpkms
369-
batchtime: 10080 # 7 days
370-
- name: test-gcpkms-fail
371-
- name: test-azurekms
372-
batchtime: 10080 # 7 days
373-
- name: test-azurekms-fail
374-
375-
- name: rhel8-import-time
376-
display_name: Import Time
377-
run_on: rhel87-small
378-
tasks:
379-
- name: "check-import-time"
380-
381-
- name: backport-pr
382-
display_name: "Backport PR"
383-
run_on:
384-
- rhel8.7-small
385-
tasks:
386-
- name: "backport-pr"

‎.evergreen/generated_configs/tasks.yml

Lines changed: 217 additions & 4 deletions
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
@@ -775,42 +805,225 @@ tasks:
775805
SUB_TEST_NAME: azure-fail
776806

777807
# Load balancer tests
778-
- name: test-load-balancer-auth-ssl
808+
- name: test-load-balancer-auth-ssl-v6.0
809+
commands:
810+
- func: run server
811+
vars:
812+
TOPOLOGY: sharded_cluster
813+
AUTH: auth
814+
SSL: ssl
815+
TEST_NAME: load_balancer
816+
VERSION: "6.0"
817+
- func: run tests
818+
vars:
819+
AUTH: auth
820+
SSL: ssl
821+
TEST_NAME: load_balancer
822+
tags: [load-balancer, auth, ssl]
823+
- name: test-load-balancer-auth-ssl-v7.0
824+
commands:
825+
- func: run server
826+
vars:
827+
TOPOLOGY: sharded_cluster
828+
AUTH: auth
829+
SSL: ssl
830+
TEST_NAME: load_balancer
831+
VERSION: "7.0"
832+
- func: run tests
833+
vars:
834+
AUTH: auth
835+
SSL: ssl
836+
TEST_NAME: load_balancer
837+
tags: [load-balancer, auth, ssl]
838+
- name: test-load-balancer-auth-ssl-v8.0
839+
commands:
840+
- func: run server
841+
vars:
842+
TOPOLOGY: sharded_cluster
843+
AUTH: auth
844+
SSL: ssl
845+
TEST_NAME: load_balancer
846+
VERSION: "8.0"
847+
- func: run tests
848+
vars:
849+
AUTH: auth
850+
SSL: ssl
851+
TEST_NAME: load_balancer
852+
tags: [load-balancer, auth, ssl]
853+
- name: test-load-balancer-auth-ssl-rapid
854+
commands:
855+
- func: run server
856+
vars:
857+
TOPOLOGY: sharded_cluster
858+
AUTH: auth
859+
SSL: ssl
860+
TEST_NAME: load_balancer
861+
VERSION: rapid
862+
- func: run tests
863+
vars:
864+
AUTH: auth
865+
SSL: ssl
866+
TEST_NAME: load_balancer
867+
tags: [load-balancer, auth, ssl]
868+
- name: test-load-balancer-auth-ssl-latest
779869
commands:
780870
- func: run server
781871
vars:
782872
TOPOLOGY: sharded_cluster
783873
AUTH: auth
784874
SSL: ssl
785875
TEST_NAME: load_balancer
876+
VERSION: latest
786877
- func: run tests
787878
vars:
788879
AUTH: auth
789880
SSL: ssl
790881
TEST_NAME: load_balancer
791882
tags: [load-balancer, auth, ssl]
792-
- name: test-load-balancer-noauth-ssl
883+
- name: test-load-balancer-noauth-ssl-v6.0
884+
commands:
885+
- func: run server
886+
vars:
887+
TOPOLOGY: sharded_cluster
888+
AUTH: noauth
889+
SSL: ssl
890+
TEST_NAME: load_balancer
891+
VERSION: "6.0"
892+
- func: run tests
893+
vars:
894+
AUTH: noauth
895+
SSL: ssl
896+
TEST_NAME: load_balancer
897+
tags: [load-balancer, noauth, ssl]
898+
- name: test-load-balancer-noauth-ssl-v7.0
899+
commands:
900+
- func: run server
901+
vars:
902+
TOPOLOGY: sharded_cluster
903+
AUTH: noauth
904+
SSL: ssl
905+
TEST_NAME: load_balancer
906+
VERSION: "7.0"
907+
- func: run tests
908+
vars:
909+
AUTH: noauth
910+
SSL: ssl
911+
TEST_NAME: load_balancer
912+
tags: [load-balancer, noauth, ssl]
913+
- name: test-load-balancer-noauth-ssl-v8.0
914+
commands:
915+
- func: run server
916+
vars:
917+
TOPOLOGY: sharded_cluster
918+
AUTH: noauth
919+
SSL: ssl
920+
TEST_NAME: load_balancer
921+
VERSION: "8.0"
922+
- func: run tests
923+
vars:
924+
AUTH: noauth
925+
SSL: ssl
926+
TEST_NAME: load_balancer
927+
tags: [load-balancer, noauth, ssl]
928+
- name: test-load-balancer-noauth-ssl-rapid
793929
commands:
794930
- func: run server
795931
vars:
796932
TOPOLOGY: sharded_cluster
797933
AUTH: noauth
798934
SSL: ssl
799935
TEST_NAME: load_balancer
936+
VERSION: rapid
937+
- func: run tests
938+
vars:
939+
AUTH: noauth
940+
SSL: ssl
941+
TEST_NAME: load_balancer
942+
tags: [load-balancer, noauth, ssl]
943+
- name: test-load-balancer-noauth-ssl-latest
944+
commands:
945+
- func: run server
946+
vars:
947+
TOPOLOGY: sharded_cluster
948+
AUTH: noauth
949+
SSL: ssl
950+
TEST_NAME: load_balancer
951+
VERSION: latest
800952
- func: run tests
801953
vars:
802954
AUTH: noauth
803955
SSL: ssl
804956
TEST_NAME: load_balancer
805957
tags: [load-balancer, noauth, ssl]
806-
- name: test-load-balancer-noauth-nossl
958+
- name: test-load-balancer-noauth-nossl-v6.0
959+
commands:
960+
- func: run server
961+
vars:
962+
TOPOLOGY: sharded_cluster
963+
AUTH: noauth
964+
SSL: nossl
965+
TEST_NAME: load_balancer
966+
VERSION: "6.0"
967+
- func: run tests
968+
vars:
969+
AUTH: noauth
970+
SSL: nossl
971+
TEST_NAME: load_balancer
972+
tags: [load-balancer, noauth, nossl]
973+
- name: test-load-balancer-noauth-nossl-v7.0
974+
commands:
975+
- func: run server
976+
vars:
977+
TOPOLOGY: sharded_cluster
978+
AUTH: noauth
979+
SSL: nossl
980+
TEST_NAME: load_balancer
981+
VERSION: "7.0"
982+
- func: run tests
983+
vars:
984+
AUTH: noauth
985+
SSL: nossl
986+
TEST_NAME: load_balancer
987+
tags: [load-balancer, noauth, nossl]
988+
- name: test-load-balancer-noauth-nossl-v8.0
989+
commands:
990+
- func: run server
991+
vars:
992+
TOPOLOGY: sharded_cluster
993+
AUTH: noauth
994+
SSL: nossl
995+
TEST_NAME: load_balancer
996+
VERSION: "8.0"
997+
- func: run tests
998+
vars:
999+
AUTH: noauth
1000+
SSL: nossl
1001+
TEST_NAME: load_balancer
1002+
tags: [load-balancer, noauth, nossl]
1003+
- name: test-load-balancer-noauth-nossl-rapid
1004+
commands:
1005+
- func: run server
1006+
vars:
1007+
TOPOLOGY: sharded_cluster
1008+
AUTH: noauth
1009+
SSL: nossl
1010+
TEST_NAME: load_balancer
1011+
VERSION: rapid
1012+
- func: run tests
1013+
vars:
1014+
AUTH: noauth
1015+
SSL: nossl
1016+
TEST_NAME: load_balancer
1017+
tags: [load-balancer, noauth, nossl]
1018+
- name: test-load-balancer-noauth-nossl-latest
8071019
commands:
8081020
- func: run server
8091021
vars:
8101022
TOPOLOGY: sharded_cluster
8111023
AUTH: noauth
8121024
SSL: nossl
8131025
TEST_NAME: load_balancer
1026+
VERSION: latest
8141027
- func: run tests
8151028
vars:
8161029
AUTH: noauth

0 commit comments

Comments
 (0)