Skip to content

Commit 0351992

Browse files
authored
PYTHON-5204 Convert Serverless tests to use new test scripts (#2197)
1 parent 189923f commit 0351992

File tree

6 files changed

+27
-42
lines changed

6 files changed

+27
-42
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -372,29 +372,6 @@ post:
372372
- func: "cleanup"
373373

374374
task_groups:
375-
- name: serverless_task_group
376-
setup_group_can_fail_task: true
377-
setup_group_timeout_secs: 1800 # 30 minutes
378-
setup_group:
379-
- func: "fetch source"
380-
- func: "setup system"
381-
- command: subprocess.exec
382-
params:
383-
binary: bash
384-
env:
385-
VAULT_NAME: ${VAULT_NAME}
386-
args:
387-
- ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
388-
teardown_task:
389-
- command: subprocess.exec
390-
params:
391-
binary: bash
392-
args:
393-
- ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
394-
- func: "upload test results"
395-
tasks:
396-
- ".serverless"
397-
398375
- name: test_aws_lambda_task_group
399376
setup_group:
400377
- func: fetch source
@@ -445,13 +422,6 @@ tasks:
445422
- func: "run server"
446423
- func: "run doctests"
447424

448-
- name: "test-serverless"
449-
tags: ["serverless"]
450-
commands:
451-
- func: "run tests"
452-
vars:
453-
TEST_NAME: serverless
454-
455425
- name: "test-enterprise-auth"
456426
tags: ["enterprise-auth"]
457427
commands:

.evergreen/generated_configs/tasks.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5866,3 +5866,13 @@ tasks:
58665866
- noauth
58675867
- nossl
58685868
- sync_async
5869+
5870+
# Serverless tests
5871+
- name: test-serverless
5872+
commands:
5873+
- func: run tests
5874+
vars:
5875+
TEST_NAME: serverless
5876+
AUTH: auth
5877+
SSL: ssl
5878+
tags: [serverless]

.evergreen/generated_configs/variants.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,27 +1235,21 @@ buildvariants:
12351235
# Serverless tests
12361236
- name: serverless-rhel8-python3.9
12371237
tasks:
1238-
- name: serverless_task_group
1238+
- name: .serverless
12391239
display_name: Serverless RHEL8 Python3.9
12401240
run_on:
12411241
- rhel87-small
12421242
batchtime: 10080
12431243
expansions:
1244-
TEST_NAME: serverless
1245-
AUTH: auth
1246-
SSL: ssl
12471244
PYTHON_BINARY: /opt/python/3.9/bin/python3
12481245
- name: serverless-rhel8-python3.13
12491246
tasks:
1250-
- name: serverless_task_group
1247+
- name: .serverless
12511248
display_name: Serverless RHEL8 Python3.13
12521249
run_on:
12531250
- rhel87-small
12541251
batchtime: 10080
12551252
expansions:
1256-
TEST_NAME: serverless
1257-
AUTH: auth
1258-
SSL: ssl
12591253
PYTHON_BINARY: /opt/python/3.13/bin/python3
12601254

12611255
# Stable api tests

.evergreen/scripts/generate_config.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,16 +645,14 @@ def create_disable_test_commands_variants():
645645
def create_serverless_variants():
646646
host = DEFAULT_HOST
647647
batchtime = BATCHTIME_WEEK
648-
expansions = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
649-
tasks = ["serverless_task_group"]
648+
tasks = [".serverless"]
650649
base_name = "Serverless"
651650
return [
652651
create_variant(
653652
tasks,
654653
get_display_name(base_name, host, python=python),
655654
host=host,
656655
python=python,
657-
expansions=expansions,
658656
batchtime=batchtime,
659657
)
660658
for python in MIN_MAX_PYTHON
@@ -951,6 +949,14 @@ def create_ocsp_tasks():
951949
return tasks
952950

953951

952+
def create_serverless_tasks():
953+
vars = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
954+
test_func = FunctionCall(func="run tests", vars=vars)
955+
tags = ["serverless"]
956+
task_name = "test-serverless"
957+
return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
958+
959+
954960
##################
955961
# Generate Config
956962
##################

.evergreen/scripts/setup_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ def handle_test_env() -> None:
174174
DB_USER = config["ADL_USERNAME"]
175175
DB_PASSWORD = config["ADL_PASSWORD"]
176176
elif test_name == "serverless":
177+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/setup.sh")
177178
config = read_env(f"{DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh")
178179
DB_USER = config["SERVERLESS_ATLAS_USER"]
179180
DB_PASSWORD = config["SERVERLESS_ATLAS_PASSWORD"]

.evergreen/scripts/teardown_tests.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232

3333
# Tear down ocsp if applicable.
3434
elif TEST_NAME == "ocsp":
35-
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/teardown.sh")
35+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh")
36+
37+
# Tear down serverless if applicable.
38+
elif TEST_NAME == "serverless":
39+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh")
3640

3741
# Tear down auth_aws if applicable.
3842
# We do not run web-identity hosts on macos, because the hosts lack permissions,

0 commit comments

Comments
 (0)