Skip to content

Commit a2eb6f4

Browse files
committed
Configure evergreen: adds a new function, and 5 variants each containing one task/test
1 parent f494af9 commit a2eb6f4

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

.evergreen/generated_configs/functions.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,17 @@ functions:
239239
working_dir: src
240240
type: test
241241

242+
# Test numpy
243+
test numpy:
244+
- command: subprocess.exec
245+
params:
246+
binary: bash
247+
args:
248+
- .evergreen/just.sh
249+
- test-numpy
250+
working_dir: src
251+
type: test
252+
242253
# Upload coverage
243254
upload coverage:
244255
- command: ec2.assume_role

.evergreen/generated_configs/tasks.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4771,9 +4771,7 @@ tasks:
47714771
# Test numpy tests
47724772
- name: test-numpy
47734773
commands:
4774-
- func: run test numpy
4775-
vars:
4776-
TEST_NAME: test_numpy
4774+
- func: test numpy
47774775
tags: [binary, vector]
47784776

47794777
# Test standard auth tests

.evergreen/generated_configs/variants.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -616,39 +616,35 @@ buildvariants:
616616
# Test numpy tests
617617
- name: test-numpy-rhel8
618618
tasks:
619-
- name: .test-numpy
619+
- name: test-numpy
620620
display_name: Test Numpy RHEL8
621621
run_on:
622622
- rhel87-small
623623
tags: [binary-vector]
624624
- name: test-numpy-macos
625625
tasks:
626-
- name: .test-numpy
626+
- name: test-numpy
627627
display_name: Test Numpy macOS
628628
run_on:
629629
- macos-14
630630
tags: [binary-vector]
631631
- name: test-numpy-macos-arm64
632632
tasks:
633-
- name: .test-numpy !.pypy .server-6.0
634-
- name: .test-numpy !.pypy .server-7.0
635-
- name: .test-numpy !.pypy .server-8.0
636-
- name: .test-numpy !.pypy .server-rapid
637-
- name: .test-numpy !.pypy .server-latest
633+
- name: test-numpy
638634
display_name: Test Numpy macOS Arm64
639635
run_on:
640636
- macos-14-arm64
641637
tags: [binary-vector]
642638
- name: test-numpy-win64
643639
tasks:
644-
- name: .test-numpy
640+
- name: test-numpy
645641
display_name: Test Numpy Win64
646642
run_on:
647643
- windows-64-vsMulti-small
648644
tags: [binary-vector]
649645
- name: test-numpy-win32
650646
tasks:
651-
- name: .test-numpy
647+
- name: test-numpy
652648
display_name: Test Numpy Win32
653649
run_on:
654650
- windows-64-vsMulti-small

.evergreen/scripts/generate_config.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ def create_disable_test_commands_variants():
324324

325325

326326
def create_test_numpy_tasks():
327-
vars = dict(TEST_NAME="test_numpy")
328-
test_func = FunctionCall(func="run test numpy", vars=vars)
327+
test_func = FunctionCall(func="test numpy")
329328
task_name = "test-numpy"
330329
tags = ["binary", "vector"]
331330
return [EvgTask(name=task_name, tags=tags, commands=[test_func])]
@@ -337,12 +336,7 @@ def create_test_numpy_variants() -> list[BuildVariant]:
337336

338337
# Test a subset on each of the other platforms.
339338
for host_name in ("rhel8", "macos", "macos-arm64", "win64", "win32"):
340-
tasks = [".test-numpy"]
341-
# MacOS arm64 only works on server versions 6.0+
342-
if host_name == "macos-arm64":
343-
tasks = [
344-
f".test-numpy !.pypy .server-{version}" for version in get_versions_from("6.0")
345-
]
339+
tasks = ["test-numpy"]
346340
host = HOSTS[host_name]
347341
tags = ["binary-vector"]
348342
expansions = dict()
@@ -1156,6 +1150,11 @@ def create_run_tests_func():
11561150
return "run tests", [setup_cmd, test_cmd]
11571151

11581152

1153+
def create_test_numpy_func():
1154+
test_cmd = get_subprocess_exec(args=[".evergreen/just.sh", "test-numpy"])
1155+
return "test numpy", [test_cmd]
1156+
1157+
11591158
def create_cleanup_func():
11601159
cmd = get_subprocess_exec(args=[".evergreen/scripts/cleanup.sh"])
11611160
return "cleanup", [cmd]
@@ -1206,6 +1205,3 @@ def create_send_dashboard_data_func():
12061205
write_variants_to_file(mod)
12071206
write_tasks_to_file(mod)
12081207
write_functions_to_file(mod)
1209-
1210-
# TODO - Create a new variant here that drives run-test
1211-
# Workfromrove

0 commit comments

Comments
 (0)