Skip to content

Commit c2aae63

Browse files
committed
PYTHON-5204 Convert Serverless tests to use new test scripts
1 parent 34ca759 commit c2aae63

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
@@ -394,29 +394,6 @@ post:
394394
- func: "cleanup"
395395

396396
task_groups:
397-
- name: serverless_task_group
398-
setup_group_can_fail_task: true
399-
setup_group_timeout_secs: 1800 # 30 minutes
400-
setup_group:
401-
- func: "fetch source"
402-
- func: "setup system"
403-
- command: subprocess.exec
404-
params:
405-
binary: bash
406-
env:
407-
VAULT_NAME: ${VAULT_NAME}
408-
args:
409-
- ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
410-
teardown_task:
411-
- command: subprocess.exec
412-
params:
413-
binary: bash
414-
args:
415-
- ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
416-
- func: "upload test results"
417-
tasks:
418-
- ".serverless"
419-
420397
- name: testazureoidc_task_group
421398
setup_group:
422399
- func: fetch source
@@ -557,13 +534,6 @@ tasks:
557534
- func: "run server"
558535
- func: "run doctests"
559536

560-
- name: "test-serverless"
561-
tags: ["serverless"]
562-
commands:
563-
- func: "run tests"
564-
vars:
565-
TEST_NAME: serverless
566-
567537
- name: "test-enterprise-auth"
568538
tags: ["enterprise-auth"]
569539
commands:

.evergreen/generated_configs/tasks.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5822,3 +5822,13 @@ tasks:
58225822
- noauth
58235823
- nossl
58245824
- sync_async
5825+
5826+
# Serverless tests
5827+
- name: test-serverless
5828+
commands:
5829+
- func: run tests
5830+
vars:
5831+
TEST_NAME: serverless
5832+
AUTH: auth
5833+
SSL: ssl
5834+
tags: [serverless]

.evergreen/generated_configs/variants.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,27 +1238,21 @@ buildvariants:
12381238
# Serverless tests
12391239
- name: serverless-rhel8-python3.9
12401240
tasks:
1241-
- name: serverless_task_group
1241+
- name: .serverless
12421242
display_name: Serverless RHEL8 Python3.9
12431243
run_on:
12441244
- rhel87-small
12451245
batchtime: 10080
12461246
expansions:
1247-
TEST_NAME: serverless
1248-
AUTH: auth
1249-
SSL: ssl
12501247
PYTHON_BINARY: /opt/python/3.9/bin/python3
12511248
- name: serverless-rhel8-python3.13
12521249
tasks:
1253-
- name: serverless_task_group
1250+
- name: .serverless
12541251
display_name: Serverless RHEL8 Python3.13
12551252
run_on:
12561253
- rhel87-small
12571254
batchtime: 10080
12581255
expansions:
1259-
TEST_NAME: serverless
1260-
AUTH: auth
1261-
SSL: ssl
12621256
PYTHON_BINARY: /opt/python/3.13/bin/python3
12631257

12641258
# 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
@@ -938,6 +936,14 @@ def create_ocsp_tasks():
938936
return tasks
939937

940938

939+
def create_serverless_tasks():
940+
vars = dict(TEST_NAME="serverless", AUTH="auth", SSL="ssl")
941+
test_func = FunctionCall(func="run tests", vars=vars)
942+
tags = ["serverless"]
943+
task_name = "test-serverless"
944+
return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
945+
946+
941947
##################
942948
# Generate Config
943949
##################

.evergreen/scripts/setup_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ def handle_test_env() -> None:
167167
DB_USER = config["ADL_USERNAME"]
168168
DB_PASSWORD = config["ADL_PASSWORD"]
169169
elif test_name == "serverless":
170+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/setup.sh")
170171
config = read_env(f"{DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh")
171172
DB_USER = config["SERVERLESS_ATLAS_USER"]
172173
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
@@ -26,7 +26,11 @@
2626

2727
# Tear down ocsp if applicable.
2828
elif TEST_NAME == "ocsp":
29-
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/teardown.sh")
29+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh")
30+
31+
# Tear down serverless if applicable.
32+
elif TEST_NAME == "serverless":
33+
run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh")
3034

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

0 commit comments

Comments
 (0)