Skip to content

Commit 3afd732

Browse files
sleepySticksleepyStick
authored
Merge branch 'mongodb:master' into PYTHON-3636 
2 parents 79c09ea + a548f7a commit 3afd732

Some content is hidden

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

60 files changed

+2587
-1296
lines changed

‎.evergreen/config.yml

Lines changed: 21 additions & 650 deletions
Large diffs are not rendered by default.

‎.evergreen/generated_configs/tasks.yml

Lines changed: 1222 additions & 251 deletions
Large diffs are not rendered by default.

‎.evergreen/generated_configs/variants.yml

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -107,95 +107,51 @@ buildvariants:
107107
# Aws auth tests
108108
- name: auth-aws-ubuntu-20-python3.9
109109
tasks:
110-
- name: aws-auth-test-4.4
111-
- name: aws-auth-test-5.0
112-
- name: aws-auth-test-6.0
113-
- name: aws-auth-test-7.0
114-
- name: aws-auth-test-8.0
115-
- name: aws-auth-test-rapid
116-
- name: aws-auth-test-latest
110+
- name: .auth-aws
117111
display_name: Auth AWS Ubuntu-20 Python3.9
118112
run_on:
119113
- ubuntu2004-small
120114
expansions:
121115
PYTHON_BINARY: /opt/python/3.9/bin/python3
122116
- name: auth-aws-ubuntu-20-python3.13
123117
tasks:
124-
- name: aws-auth-test-4.4
125-
- name: aws-auth-test-5.0
126-
- name: aws-auth-test-6.0
127-
- name: aws-auth-test-7.0
128-
- name: aws-auth-test-8.0
129-
- name: aws-auth-test-rapid
130-
- name: aws-auth-test-latest
118+
- name: .auth-aws
131119
display_name: Auth AWS Ubuntu-20 Python3.13
132120
run_on:
133121
- ubuntu2004-small
134122
expansions:
135123
PYTHON_BINARY: /opt/python/3.13/bin/python3
136124
- name: auth-aws-win64-python3.9
137125
tasks:
138-
- name: aws-auth-test-4.4
139-
- name: aws-auth-test-5.0
140-
- name: aws-auth-test-6.0
141-
- name: aws-auth-test-7.0
142-
- name: aws-auth-test-8.0
143-
- name: aws-auth-test-rapid
144-
- name: aws-auth-test-latest
126+
- name: .auth-aws !.auth-aws-ecs
145127
display_name: Auth AWS Win64 Python3.9
146128
run_on:
147129
- windows-64-vsMulti-small
148130
expansions:
149-
skip_ECS_auth_test: "true"
150131
PYTHON_BINARY: C:/python/Python39/python.exe
151132
- name: auth-aws-win64-python3.13
152133
tasks:
153-
- name: aws-auth-test-4.4
154-
- name: aws-auth-test-5.0
155-
- name: aws-auth-test-6.0
156-
- name: aws-auth-test-7.0
157-
- name: aws-auth-test-8.0
158-
- name: aws-auth-test-rapid
159-
- name: aws-auth-test-latest
134+
- name: .auth-aws !.auth-aws-ecs
160135
display_name: Auth AWS Win64 Python3.13
161136
run_on:
162137
- windows-64-vsMulti-small
163138
expansions:
164-
skip_ECS_auth_test: "true"
165139
PYTHON_BINARY: C:/python/Python313/python.exe
166140
- name: auth-aws-macos-python3.9
167141
tasks:
168-
- name: aws-auth-test-4.4
169-
- name: aws-auth-test-5.0
170-
- name: aws-auth-test-6.0
171-
- name: aws-auth-test-7.0
172-
- name: aws-auth-test-8.0
173-
- name: aws-auth-test-rapid
174-
- name: aws-auth-test-latest
142+
- name: .auth-aws !.auth-aws-web-identity !.auth-aws-ecs !.auth-aws-ec2
175143
display_name: Auth AWS macOS Python3.9
176144
run_on:
177145
- macos-14
178146
expansions:
179-
skip_ECS_auth_test: "true"
180-
skip_EC2_auth_test: "true"
181-
skip_web_identity_auth_test: "true"
182147
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
183148
- name: auth-aws-macos-python3.13
184149
tasks:
185-
- name: aws-auth-test-4.4
186-
- name: aws-auth-test-5.0
187-
- name: aws-auth-test-6.0
188-
- name: aws-auth-test-7.0
189-
- name: aws-auth-test-8.0
190-
- name: aws-auth-test-rapid
191-
- name: aws-auth-test-latest
150+
- name: .auth-aws !.auth-aws-web-identity !.auth-aws-ecs !.auth-aws-ec2
192151
display_name: Auth AWS macOS Python3.13
193152
run_on:
194153
- macos-14
195154
expansions:
196-
skip_ECS_auth_test: "true"
197-
skip_EC2_auth_test: "true"
198-
skip_web_identity_auth_test: "true"
199155
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
200156

201157
# Compression tests
@@ -823,7 +779,7 @@ buildvariants:
823779
display_name: OCSP RHEL8 v4.4 Python3.9
824780
run_on:
825781
- rhel87-small
826-
batchtime: 20160
782+
batchtime: 10080
827783
expansions:
828784
AUTH: noauth
829785
SSL: ssl
@@ -836,7 +792,7 @@ buildvariants:
836792
display_name: OCSP RHEL8 v5.0 Python3.10
837793
run_on:
838794
- rhel87-small
839-
batchtime: 20160
795+
batchtime: 10080
840796
expansions:
841797
AUTH: noauth
842798
SSL: ssl
@@ -849,7 +805,7 @@ buildvariants:
849805
display_name: OCSP RHEL8 v6.0 Python3.11
850806
run_on:
851807
- rhel87-small
852-
batchtime: 20160
808+
batchtime: 10080
853809
expansions:
854810
AUTH: noauth
855811
SSL: ssl
@@ -862,7 +818,7 @@ buildvariants:
862818
display_name: OCSP RHEL8 v7.0 Python3.12
863819
run_on:
864820
- rhel87-small
865-
batchtime: 20160
821+
batchtime: 10080
866822
expansions:
867823
AUTH: noauth
868824
SSL: ssl
@@ -875,7 +831,7 @@ buildvariants:
875831
display_name: OCSP RHEL8 v8.0 Python3.13
876832
run_on:
877833
- rhel87-small
878-
batchtime: 20160
834+
batchtime: 10080
879835
expansions:
880836
AUTH: noauth
881837
SSL: ssl
@@ -888,7 +844,7 @@ buildvariants:
888844
display_name: OCSP RHEL8 rapid PyPy3.10
889845
run_on:
890846
- rhel87-small
891-
batchtime: 20160
847+
batchtime: 10080
892848
expansions:
893849
AUTH: noauth
894850
SSL: ssl
@@ -901,7 +857,7 @@ buildvariants:
901857
display_name: OCSP RHEL8 latest Python3.9
902858
run_on:
903859
- rhel87-small
904-
batchtime: 20160
860+
batchtime: 10080
905861
expansions:
906862
AUTH: noauth
907863
SSL: ssl
@@ -914,7 +870,7 @@ buildvariants:
914870
display_name: OCSP Win64 v4.4 Python3.9
915871
run_on:
916872
- windows-64-vsMulti-small
917-
batchtime: 20160
873+
batchtime: 10080
918874
expansions:
919875
AUTH: noauth
920876
SSL: ssl
@@ -927,7 +883,7 @@ buildvariants:
927883
display_name: OCSP Win64 v8.0 Python3.13
928884
run_on:
929885
- windows-64-vsMulti-small
930-
batchtime: 20160
886+
batchtime: 10080
931887
expansions:
932888
AUTH: noauth
933889
SSL: ssl
@@ -940,7 +896,7 @@ buildvariants:
940896
display_name: OCSP macOS v4.4 Python3.9
941897
run_on:
942898
- macos-14
943-
batchtime: 20160
899+
batchtime: 10080
944900
expansions:
945901
AUTH: noauth
946902
SSL: ssl
@@ -953,7 +909,7 @@ buildvariants:
953909
display_name: OCSP macOS v8.0 Python3.13
954910
run_on:
955911
- macos-14
956-
batchtime: 20160
912+
batchtime: 10080
957913
expansions:
958914
AUTH: noauth
959915
SSL: ssl
@@ -971,21 +927,21 @@ buildvariants:
971927
display_name: Auth OIDC Ubuntu-22
972928
run_on:
973929
- ubuntu2204-small
974-
batchtime: 20160
930+
batchtime: 10080
975931
- name: auth-oidc-macos
976932
tasks:
977933
- name: testoidc_task_group
978934
display_name: Auth OIDC macOS
979935
run_on:
980936
- macos-14
981-
batchtime: 20160
937+
batchtime: 10080
982938
- name: auth-oidc-win64
983939
tasks:
984940
- name: testoidc_task_group
985941
display_name: Auth OIDC Win64
986942
run_on:
987943
- windows-64-vsMulti-small
988-
batchtime: 20160
944+
batchtime: 10080
989945

990946
# Pyopenssl tests
991947
- name: pyopenssl-macos-python3.9

‎.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ export SET_XTRACE_ON=1
3030
cd src
3131
rm -rf .venv
3232
rm -f .evergreen/scripts/test-env.sh || true
33-
bash ./.evergreen/just.sh setup-tests auth_aws ecs
33+
bash ./.evergreen/just.sh setup-tests auth_aws ecs-remote
3434
bash .evergreen/just.sh run-tests

‎.evergreen/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ fi
3333
PIP_QUIET=0 uv run ${UV_ARGS} --with pip pip list
3434

3535
# Start the test runner.
36-
uv run ${UV_ARGS} .evergreen/scripts/run_tests.py
36+
uv run ${UV_ARGS} .evergreen/scripts/run_tests.py "$@"
3737

3838
popd

‎.evergreen/scripts/bootstrap-mongo-orchestration.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)