Skip to content

Commit 28dded8

Browse files
blink1073blink1073
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents 3b6ab84 + f69e1f6 commit 28dded8

File tree

12 files changed

+587
-511
lines changed

12 files changed

+587
-511
lines changed

‎.evergreen/config.yml

Lines changed: 41 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -201,17 +201,17 @@ functions:
201201
params:
202202
file: "src/xunit-results/TEST-*.xml"
203203

204-
"bootstrap mongo-orchestration":
204+
"run-server":
205205
- command: subprocess.exec
206206
params:
207207
binary: bash
208-
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, LOAD_BALANCER,
209-
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS]
210-
args:
211-
- src/.evergreen/scripts/bootstrap-mongo-orchestration.sh
208+
working_dir: "src"
209+
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE,
210+
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER]
211+
args: [.evergreen/just.sh, run-server, "${TEST_NAME}", "${SUB_TEST_NAME}"]
212212
- command: expansions.update
213213
params:
214-
file: mo-expansion.yml
214+
file: ${DRIVERS_TOOLS}/mo-expansion.yml
215215

216216
"bootstrap data lake":
217217
- command: subprocess.exec
@@ -227,13 +227,6 @@ functions:
227227
args:
228228
- ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
229229

230-
"stop mongo-orchestration":
231-
- command: subprocess.exec
232-
params:
233-
binary: bash
234-
args:
235-
- ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
236-
237230
"run mod_wsgi tests":
238231
- command: subprocess.exec
239232
type: test
@@ -423,7 +416,6 @@ post:
423416
- func: "upload coverage"
424417
- func: "upload mo artifacts"
425418
- func: "upload test results"
426-
- func: "stop mongo-orchestration"
427419
- func: "cleanup"
428420

429421
task_groups:
@@ -587,10 +579,7 @@ tasks:
587579
- name: "doctests"
588580
tags: ["doctests"]
589581
commands:
590-
- func: "bootstrap mongo-orchestration"
591-
vars:
592-
VERSION: "latest"
593-
TOPOLOGY: "server"
582+
- func: "run-server"
594583
- func: "run doctests"
595584

596585
- name: "test-serverless"
@@ -603,16 +592,13 @@ tasks:
603592
- name: "test-enterprise-auth"
604593
tags: ["enterprise-auth"]
605594
commands:
606-
- func: "bootstrap mongo-orchestration"
607-
vars:
608-
VERSION: "latest"
609-
TOPOLOGY: "server"
595+
- func: "run-server"
610596
- func: "assume ec2 role"
611597
- func: "run enterprise auth tests"
612598

613599
- name: "test-search-index-helpers"
614600
commands:
615-
- func: "bootstrap mongo-orchestration"
601+
- func: "run-server"
616602
vars:
617603
VERSION: "6.0"
618604
TOPOLOGY: "replica_set"
@@ -624,38 +610,32 @@ tasks:
624610
- name: "mod-wsgi-standalone"
625611
tags: ["mod_wsgi"]
626612
commands:
627-
- func: "bootstrap mongo-orchestration"
613+
- func: "run-server"
628614
vars:
629-
VERSION: "latest"
630615
TOPOLOGY: "server"
631616
- func: "run mod_wsgi tests"
632617

633618
- name: "mod-wsgi-replica-set"
634619
tags: ["mod_wsgi"]
635620
commands:
636-
- func: "bootstrap mongo-orchestration"
621+
- func: "run-server"
637622
vars:
638-
VERSION: "latest"
639623
TOPOLOGY: "replica_set"
640624
- func: "run mod_wsgi tests"
641625

642626
- name: "mod-wsgi-embedded-mode-standalone"
643627
tags: ["mod_wsgi"]
644628
commands:
645-
- func: "bootstrap mongo-orchestration"
646-
vars:
647-
VERSION: "latest"
648-
TOPOLOGY: "server"
629+
- func: "run-server"
649630
- func: "run mod_wsgi tests"
650631
vars:
651632
MOD_WSGI_EMBEDDED: "1"
652633

653634
- name: "mod-wsgi-embedded-mode-replica-set"
654635
tags: ["mod_wsgi"]
655636
commands:
656-
- func: "bootstrap mongo-orchestration"
637+
- func: "run-server"
657638
vars:
658-
VERSION: "latest"
659639
TOPOLOGY: "replica_set"
660640
- func: "run mod_wsgi tests"
661641
vars:
@@ -669,7 +649,7 @@ tasks:
669649
- name: "free-threading"
670650
tags: ["free-threading"]
671651
commands:
672-
- func: "bootstrap mongo-orchestration"
652+
- func: "run-server"
673653
vars:
674654
VERSION: "8.0"
675655
TOPOLOGY: "replica_set"
@@ -711,7 +691,7 @@ tasks:
711691
vars:
712692
OCSP_ALGORITHM: "rsa"
713693
SERVER_TYPE: "valid"
714-
- func: "bootstrap mongo-orchestration"
694+
- func: "run-server"
715695
vars:
716696
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
717697
- func: run-ocsp-test
@@ -726,7 +706,7 @@ tasks:
726706
vars:
727707
OCSP_ALGORITHM: "rsa"
728708
SERVER_TYPE: "revoked"
729-
- func: "bootstrap mongo-orchestration"
709+
- func: "run-server"
730710
vars:
731711
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
732712
- func: run-ocsp-test
@@ -741,7 +721,7 @@ tasks:
741721
vars:
742722
OCSP_ALGORITHM: "rsa"
743723
SERVER_TYPE: valid
744-
- func: "bootstrap mongo-orchestration"
724+
- func: "run-server"
745725
vars:
746726
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
747727
- func: run-ocsp-test
@@ -756,7 +736,7 @@ tasks:
756736
vars:
757737
OCSP_ALGORITHM: "rsa"
758738
SERVER_TYPE: revoked
759-
- func: "bootstrap mongo-orchestration"
739+
- func: "run-server"
760740
vars:
761741
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
762742
- func: run-ocsp-test
@@ -767,7 +747,7 @@ tasks:
767747
- name: test-ocsp-rsa-soft-fail
768748
tags: ["ocsp", "ocsp-rsa"]
769749
commands:
770-
- func: "bootstrap mongo-orchestration"
750+
- func: "run-server"
771751
vars:
772752
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
773753
- func: run-ocsp-test
@@ -782,7 +762,7 @@ tasks:
782762
vars:
783763
OCSP_ALGORITHM: "rsa"
784764
SERVER_TYPE: revoked
785-
- func: "bootstrap mongo-orchestration"
765+
- func: "run-server"
786766
vars:
787767
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json"
788768
- func: run-ocsp-test
@@ -793,7 +773,7 @@ tasks:
793773
- name: test-ocsp-rsa-malicious-no-responder-mustStaple-server-does-not-staple
794774
tags: ["ocsp", "ocsp-rsa"]
795775
commands:
796-
- func: "bootstrap mongo-orchestration"
776+
- func: "run-server"
797777
vars:
798778
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json"
799779
- func: run-ocsp-test
@@ -808,7 +788,7 @@ tasks:
808788
vars:
809789
OCSP_ALGORITHM: "rsa"
810790
SERVER_TYPE: valid-delegate
811-
- func: "bootstrap mongo-orchestration"
791+
- func: "run-server"
812792
vars:
813793
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
814794
- func: run-ocsp-test
@@ -823,7 +803,7 @@ tasks:
823803
vars:
824804
OCSP_ALGORITHM: "rsa"
825805
SERVER_TYPE: revoked-delegate
826-
- func: "bootstrap mongo-orchestration"
806+
- func: "run-server"
827807
vars:
828808
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
829809
- func: run-ocsp-test
@@ -838,7 +818,7 @@ tasks:
838818
vars:
839819
OCSP_ALGORITHM: "rsa"
840820
SERVER_TYPE: valid-delegate
841-
- func: "bootstrap mongo-orchestration"
821+
- func: "run-server"
842822
vars:
843823
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
844824
- func: run-ocsp-test
@@ -853,7 +833,7 @@ tasks:
853833
vars:
854834
OCSP_ALGORITHM: "rsa"
855835
SERVER_TYPE: revoked-delegate
856-
- func: "bootstrap mongo-orchestration"
836+
- func: "run-server"
857837
vars:
858838
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
859839
- func: run-ocsp-test
@@ -868,7 +848,7 @@ tasks:
868848
vars:
869849
OCSP_ALGORITHM: "rsa"
870850
SERVER_TYPE: revoked-delegate
871-
- func: "bootstrap mongo-orchestration"
851+
- func: "run-server"
872852
vars:
873853
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json"
874854
- func: run-ocsp-test
@@ -883,7 +863,7 @@ tasks:
883863
vars:
884864
OCSP_ALGORITHM: "ecdsa"
885865
SERVER_TYPE: valid
886-
- func: "bootstrap mongo-orchestration"
866+
- func: "run-server"
887867
vars:
888868
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
889869
- func: run-ocsp-test
@@ -898,7 +878,7 @@ tasks:
898878
vars:
899879
OCSP_ALGORITHM: "ecdsa"
900880
SERVER_TYPE: revoked
901-
- func: "bootstrap mongo-orchestration"
881+
- func: "run-server"
902882
vars:
903883
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
904884
- func: run-ocsp-test
@@ -913,7 +893,7 @@ tasks:
913893
vars:
914894
OCSP_ALGORITHM: "ecdsa"
915895
SERVER_TYPE: valid
916-
- func: "bootstrap mongo-orchestration"
896+
- func: "run-server"
917897
vars:
918898
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
919899
- func: run-ocsp-test
@@ -928,7 +908,7 @@ tasks:
928908
vars:
929909
OCSP_ALGORITHM: "ecdsa"
930910
SERVER_TYPE: revoked
931-
- func: "bootstrap mongo-orchestration"
911+
- func: "run-server"
932912
vars:
933913
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
934914
- func: run-ocsp-test
@@ -939,7 +919,7 @@ tasks:
939919
- name: test-ocsp-ecdsa-soft-fail
940920
tags: ["ocsp", "ocsp-ecdsa"]
941921
commands:
942-
- func: "bootstrap mongo-orchestration"
922+
- func: "run-server"
943923
vars:
944924
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
945925
- func: run-ocsp-test
@@ -954,7 +934,7 @@ tasks:
954934
vars:
955935
OCSP_ALGORITHM: "ecdsa"
956936
SERVER_TYPE: revoked
957-
- func: "bootstrap mongo-orchestration"
937+
- func: "run-server"
958938
vars:
959939
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json"
960940
- func: run-ocsp-test
@@ -965,7 +945,7 @@ tasks:
965945
- name: test-ocsp-ecdsa-malicious-no-responder-mustStaple-server-does-not-staple
966946
tags: ["ocsp", "ocsp-ecdsa"]
967947
commands:
968-
- func: "bootstrap mongo-orchestration"
948+
- func: "run-server"
969949
vars:
970950
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json"
971951
- func: run-ocsp-test
@@ -980,7 +960,7 @@ tasks:
980960
vars:
981961
OCSP_ALGORITHM: "ecdsa"
982962
SERVER_TYPE: valid-delegate
983-
- func: "bootstrap mongo-orchestration"
963+
- func: "run-server"
984964
vars:
985965
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
986966
- func: run-ocsp-test
@@ -995,7 +975,7 @@ tasks:
995975
vars:
996976
OCSP_ALGORITHM: "ecdsa"
997977
SERVER_TYPE: revoked-delegate
998-
- func: "bootstrap mongo-orchestration"
978+
- func: "run-server"
999979
vars:
1000980
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
1001981
- func: run-ocsp-test
@@ -1010,7 +990,7 @@ tasks:
1010990
vars:
1011991
OCSP_ALGORITHM: "ecdsa"
1012992
SERVER_TYPE: valid-delegate
1013-
- func: "bootstrap mongo-orchestration"
993+
- func: "run-server"
1014994
vars:
1015995
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
1016996
- func: run-ocsp-test
@@ -1025,7 +1005,7 @@ tasks:
10251005
vars:
10261006
OCSP_ALGORITHM: "ecdsa"
10271007
SERVER_TYPE: revoked-delegate
1028-
- func: "bootstrap mongo-orchestration"
1008+
- func: "run-server"
10291009
vars:
10301010
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
10311011
- func: run-ocsp-test
@@ -1040,7 +1020,7 @@ tasks:
10401020
vars:
10411021
OCSP_ALGORITHM: "ecdsa"
10421022
SERVER_TYPE: valid-delegate
1043-
- func: "bootstrap mongo-orchestration"
1023+
- func: "run-server"
10441024
vars:
10451025
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json"
10461026
- func: run-ocsp-test
@@ -1115,21 +1095,19 @@ tasks:
11151095
- name: "perf-6.0-standalone"
11161096
tags: ["perf"]
11171097
commands:
1118-
- func: "bootstrap mongo-orchestration"
1098+
- func: "run-server"
11191099
vars:
11201100
VERSION: "v6.0-perf"
1121-
TOPOLOGY: "server"
11221101
- func: "run perf tests"
11231102
- func: "attach benchmark test results"
11241103
- func: "send dashboard data"
11251104

11261105
- name: "perf-6.0-standalone-ssl"
11271106
tags: ["perf"]
11281107
commands:
1129-
- func: "bootstrap mongo-orchestration"
1108+
- func: "run-server"
11301109
vars:
11311110
VERSION: "v6.0-perf"
1132-
TOPOLOGY: "server"
11331111
SSL: "ssl"
11341112
- func: "run perf tests"
11351113
- func: "attach benchmark test results"
@@ -1138,10 +1116,9 @@ tasks:
11381116
- name: "perf-8.0-standalone"
11391117
tags: ["perf"]
11401118
commands:
1141-
- func: "bootstrap mongo-orchestration"
1119+
- func: "run-server"
11421120
vars:
11431121
VERSION: "8.0"
1144-
TOPOLOGY: "server"
11451122
- func: "run perf tests"
11461123
- func: "attach benchmark test results"
11471124
- func: "send dashboard data"

0 commit comments

Comments
 (0)