@@ -42,7 +42,7 @@ functions:
4242 # Make an evergreen expansion file with dynamic values
4343 - command : subprocess.exec
4444 params :
45- include_expansions_in_env : ["is_patch", "project", "version_id", "AUTH", "SSL", "TEST_ENCRYPTION", "TEST_ENCRYPTION_PYOPENSSL", "TEST_CRYPT_SHARED", "TEST_PYOPENSSL", "SETDEFAULTENCODING", "TEST_LOADBALANCER", "TEST_SEVERLESS", "SKIP_CSOT_TESTS", "MONGODB_STARTED", "DISABLE_TEST_COMMANDS", "GREEN_FRAMEWORK", "NO_EXT", "COVERAGE", "COMPRESSORS", "MONGODB_API_VERSION", "skip_crypt_shared", "VERSION", "TOPOLOGY", "STORAGE_ENGINE", "ORCHESTRATION_FILE", "REQUIRE_API_VERSION", "LOAD_BALANCER", " skip_web_identity_auth_test", "skip_ECS_auth_test"]
45+ include_expansions_in_env : ["is_patch", "project", "version_id", "skip_web_identity_auth_test", "skip_ECS_auth_test"]
4646 binary : bash
4747 working_dir : " src"
4848 args :
@@ -205,18 +205,13 @@ functions:
205205 - command : subprocess.exec
206206 params :
207207 binary : bash
208- include_expansions_in_env : ["VERSION", "TOPOLOGY", "AUTH", "SSL", "ORCHESTRATION_FILE", "LOAD_BALANCER"]
208+ include_expansions_in_env : [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, LOAD_BALANCER,
209+ STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED]
209210 args :
210- - src/.evergreen/scripts/run-with-env.sh
211211 - src/.evergreen/scripts/bootstrap-mongo-orchestration.sh
212212 - command : expansions.update
213213 params :
214214 file : mo-expansion.yml
215- - command : expansions.update
216- params :
217- updates :
218- - key : MONGODB_STARTED
219- value : " 1"
220215
221216 " bootstrap data lake " :
222217 - command : subprocess.exec
@@ -250,17 +245,6 @@ functions:
250245 - .evergreen/scripts/run-with-env.sh
251246 - .evergreen/scripts/run-mod-wsgi-tests.sh
252247
253- " run mockupdb tests " :
254- - command : subprocess.exec
255- type : test
256- params :
257- include_expansions_in_env : ["PYTHON_BINARY"]
258- working_dir : " src"
259- binary : bash
260- args :
261- - .evergreen/scripts/run-with-env.sh
262- - .evergreen/scripts/run-mockupdb-tests.sh
263-
264248 " run doctests " :
265249 - command : subprocess.exec
266250 type : test
@@ -276,14 +260,12 @@ functions:
276260 - command : subprocess.exec
277261 type : test
278262 params :
279- include_expansions_in_env : ["TEST_DATA_LAKE", "PYTHON_BINARY", "AUTH", "SSL",
280- " AWS_ACCESS_KEY_ID" , "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_SUITES",
281- " TEST_INDEX_MANAGEMENT" , "CRYPT_SHARED_LIB_PATH", "TEST_ENCRYPTION", "TEST_ENCRYPTION_PYOPENSSL",
282- " TEST_CRYPT_SHARED" , "TEST_PYOPENSSL", "TEST_LOADBALANCER", "TEST_SEVERLESS", "MONGODB_URI"]
263+ include_expansions_in_env : [AUTH, SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
264+ AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI,
265+ DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS]
283266 binary : bash
284267 working_dir : " src"
285- args :
286- - .evergreen/scripts/setup-tests.sh
268+ args : [.evergreen/just.sh, setup-test, "${TEST_NAME}", "${SUB_TEST_NAME}"]
287269 - command : subprocess.exec
288270 type : test
289271 params :
@@ -755,7 +737,9 @@ tasks:
755737 - name : " mockupdb"
756738 tags : ["mockupdb"]
757739 commands :
758- - func : " run mockupdb tests"
740+ - func : " run tests"
741+ vars :
742+ TEST_NAME : mockupdb
759743
760744 - name : " doctests"
761745 tags : ["doctests"]
@@ -770,6 +754,8 @@ tasks:
770754 tags : ["serverless"]
771755 commands :
772756 - func : " run tests"
757+ vars :
758+ TEST_NAME : serverless
773759
774760 - name : " test-enterprise-auth"
775761 tags : ["enterprise-auth"]
@@ -789,7 +775,7 @@ tasks:
789775 TOPOLOGY : " replica_set"
790776 - func : " run tests"
791777 vars :
792- TEST_INDEX_MANAGEMENT : " 1 "
778+ TEST_NAME : index_management
793779 AUTH : " auth"
794780
795781 - name : " mod-wsgi-standalone"
@@ -857,7 +843,7 @@ tasks:
857843 - func : " bootstrap data lake"
858844 - func : " run tests"
859845 vars :
860- TEST_DATA_LAKE : " true "
846+ TEST_NAME : " data_lake "
861847
862848 - name : " test-aws-lambda-deployed"
863849 commands :
0 commit comments