Skip to content

Commit 46b5050

Browse files
committed
clean up tasks
1 parent dca6fdb commit 46b5050

File tree

3 files changed

+19
-39
lines changed

3 files changed

+19
-39
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ tasks:
1212
- name: test-atlas-data-lake
1313
commands:
1414
- func: run tests
15-
vars:
16-
TEST_NAME: data_lake
15+
tags: [atlas_data_lake]
16+
- name: test-atlas-data-lake
17+
commands:
18+
- func: run tests
1719
tags: [atlas_data_lake]
1820

1921
# Aws tests

.evergreen/generated_configs/variants.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,43 +65,21 @@ buildvariants:
6565
PYTHON_BINARY: /opt/python/3.13/bin/python3
6666

6767
# Atlas data lake tests
68-
- name: atlas-data-lake-ubuntu-22-python3.9-auth-no-c
68+
- name: atlas-data-lake-ubuntu-22-python3.9
6969
tasks:
7070
- name: .atlas_data_lake
71-
display_name: Atlas Data Lake Ubuntu-22 Python3.9 Auth No C
71+
display_name: Atlas Data Lake Ubuntu-22 Python3.9
7272
run_on:
7373
- ubuntu2204-small
7474
expansions:
75-
AUTH: auth
76-
NO_EXT: "1"
77-
PYTHON_BINARY: /opt/python/3.9/bin/python3
78-
- name: atlas-data-lake-ubuntu-22-python3.9-auth
79-
tasks:
80-
- name: .atlas_data_lake
81-
display_name: Atlas Data Lake Ubuntu-22 Python3.9 Auth
82-
run_on:
83-
- ubuntu2204-small
84-
expansions:
85-
AUTH: auth
8675
PYTHON_BINARY: /opt/python/3.9/bin/python3
87-
- name: atlas-data-lake-ubuntu-22-python3.13-auth-no-c
76+
- name: atlas-data-lake-ubuntu-22-python3.13
8877
tasks:
8978
- name: .atlas_data_lake
90-
display_name: Atlas Data Lake Ubuntu-22 Python3.13 Auth No C
79+
display_name: Atlas Data Lake Ubuntu-22 Python3.13
9180
run_on:
9281
- ubuntu2204-small
9382
expansions:
94-
AUTH: auth
95-
NO_EXT: "1"
96-
PYTHON_BINARY: /opt/python/3.13/bin/python3
97-
- name: atlas-data-lake-ubuntu-22-python3.13-auth
98-
tasks:
99-
- name: .atlas_data_lake
100-
display_name: Atlas Data Lake Ubuntu-22 Python3.13 Auth
101-
run_on:
102-
- ubuntu2204-small
103-
expansions:
104-
AUTH: auth
10583
PYTHON_BINARY: /opt/python/3.13/bin/python3
10684

10785
# Aws auth tests

.evergreen/scripts/generate_config.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -600,14 +600,10 @@ def create_no_c_ext_variants():
600600
def create_atlas_data_lake_variants():
601601
variants = []
602602
host = HOSTS["ubuntu22"]
603-
for python, c_ext in product(MIN_MAX_PYTHON, C_EXTS):
603+
for python in MIN_MAX_PYTHON:
604604
tasks = [".atlas_data_lake"]
605-
expansions = dict(AUTH="auth")
606-
handle_c_ext(c_ext, expansions)
607-
display_name = get_display_name("Atlas Data Lake", host, python=python, **expansions)
608-
variant = create_variant(
609-
tasks, display_name, host=host, python=python, expansions=expansions
610-
)
605+
display_name = get_display_name("Atlas Data Lake", host, python=python)
606+
variant = create_variant(tasks, display_name, host=host, python=python)
611607
variants.append(variant)
612608
return variants
613609

@@ -971,11 +967,15 @@ def create_perf_tasks():
971967

972968

973969
def create_atlas_data_lake_tasks():
974-
vars = dict(TEST_NAME="data_lake")
975-
test_func = FunctionCall(func="run tests", vars=vars)
976-
task_name = "test-atlas-data-lake"
977970
tags = ["atlas_data_lake"]
978-
return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
971+
tasks = []
972+
for c_ext in C_EXTS:
973+
vars = dict(TEST_NAME="data_lake")
974+
vars = handle_c_ext(c_ext, vars)
975+
test_func = FunctionCall(func="run tests", vars=vars)
976+
task_name = "test-atlas-data-lake"
977+
tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
978+
return tasks
979979

980980

981981
def create_ocsp_tasks():

0 commit comments

Comments
 (0)