@@ -357,18 +357,12 @@ def create_green_framework_variants():
357
357
358
358
359
359
def create_no_c_ext_variants ():
360
- variants = []
361
360
host = DEFAULT_HOST
362
- for python , topology in zip_cycle (CPYTHONS , TOPOLOGIES ):
363
- tasks = [f".{ topology } .noauth .nossl !.sync_async" ]
364
- expansions = dict ()
365
- handle_c_ext (C_EXTS [0 ], expansions )
366
- display_name = get_variant_name ("No C Ext" , host , python = python )
367
- variant = create_variant (
368
- tasks , display_name , host = host , python = python , expansions = expansions
369
- )
370
- variants .append (variant )
371
- return variants
361
+ tasks = [".standard-linux" ]
362
+ expansions = dict ()
363
+ handle_c_ext (C_EXTS [0 ], expansions )
364
+ display_name = get_variant_name ("No C Ext" , host )
365
+ return [create_variant (tasks , display_name , host = host )]
372
366
373
367
374
368
def create_atlas_data_lake_variants ():
@@ -469,13 +463,13 @@ def create_mockupdb_variants():
469
463
470
464
def create_doctests_variants ():
471
465
host = DEFAULT_HOST
472
- python = CPYTHONS [ 0 ]
466
+ expansions = dict ( TEST_NAME = "doctest" )
473
467
return [
474
468
create_variant (
475
- [".doctests" ],
476
- get_variant_name ("Doctests" , host , python = python ),
477
- python = python ,
469
+ [".standard-linux .standalone-noauth-nossl" ],
470
+ get_variant_name ("Doctests" , host ),
478
471
host = host ,
472
+ expansions = expansions ,
479
473
)
480
474
]
481
475
@@ -1013,14 +1007,6 @@ def create_mockupdb_tasks():
1013
1007
return [EvgTask (name = task_name , tags = tags , commands = [test_func ])]
1014
1008
1015
1009
1016
- def create_doctest_tasks ():
1017
- server_func = FunctionCall (func = "run server" )
1018
- test_func = FunctionCall (func = "run just script" , vars = dict (JUSTFILE_TARGET = "docs-test" ))
1019
- task_name = "test-doctests"
1020
- tags = ["doctests" ]
1021
- return [EvgTask (name = task_name , tags = tags , commands = [server_func , test_func ])]
1022
-
1023
-
1024
1010
def create_no_server_tasks ():
1025
1011
test_func = FunctionCall (func = "run tests" )
1026
1012
task_name = "test-no-server"
@@ -1164,13 +1150,6 @@ def create_run_server_func():
1164
1150
return "run server" , [sub_cmd , expansion_cmd ]
1165
1151
1166
1152
1167
- def create_run_just_script_func ():
1168
- includes = ["AWS_ACCESS_KEY_ID" , "AWS_SECRET_ACCESS_KEY" , "AWS_SESSION_TOKEN" ]
1169
- args = [".evergreen/just.sh" , "${JUSTFILE_TARGET}" ]
1170
- cmd = get_subprocess_exec (include_expansions_in_env = includes , args = args )
1171
- return "run just script" , [cmd ]
1172
-
1173
-
1174
1153
def create_run_tests_func ():
1175
1154
includes = [
1176
1155
"AUTH" ,
0 commit comments