Skip to content

Commit 1a408cf

Browse files
committed
Adjusting task naming for selectors
1 parent b46468f commit 1a408cf

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

.evergreen/generated_configs/tasks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4769,24 +4769,24 @@ tasks:
47694769
- pypy
47704770

47714771
# Test numpy tests
4772-
- name: test-numpy py3.10
4772+
- name: test-numpy-python3.10
47734773
commands:
47744774
- func: test numpy
47754775
vars:
47764776
TOOLCHAIN_VERSION: "3.10"
4777-
tags: [binary, vector]
4778-
- name: test-numpy py3.14
4777+
tags: [binary, vector, python-3.10]
4778+
- name: test-numpy-python3.14
47794779
commands:
47804780
- func: test numpy
47814781
vars:
47824782
TOOLCHAIN_VERSION: "3.14"
4783-
tags: [binary, vector]
4784-
- name: test-numpy pypy3.11
4783+
tags: [binary, vector, python-3.14]
4784+
- name: test-numpy-pypy3.11
47854785
commands:
47864786
- func: test numpy
47874787
vars:
47884788
TOOLCHAIN_VERSION: pypy3.11
4789-
tags: [binary, vector]
4789+
tags: [binary, vector, python-pypy3.11]
47904790

47914791
# Test standard auth tests
47924792
- name: test-standard-auth-v4.2-python3.10-auth-ssl-sharded-cluster

.evergreen/generated_configs/variants.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -625,38 +625,38 @@ buildvariants:
625625
# Test numpy tests
626626
- name: test-numpy-rhel8
627627
tasks:
628-
- name: test-numpy
628+
- name: .test-numpy
629629
display_name: Test Numpy RHEL8
630630
run_on:
631631
- rhel87-small
632-
tags: [binary-vector]
632+
tags: [binary, vector]
633633
- name: test-numpy-macos
634634
tasks:
635-
- name: test-numpy
635+
- name: .test-numpy
636636
display_name: Test Numpy macOS
637637
run_on:
638638
- macos-14
639-
tags: [binary-vector]
639+
tags: [binary, vector]
640640
- name: test-numpy-macos-arm64
641641
tasks:
642-
- name: test-numpy
642+
- name: .test-numpy
643643
display_name: Test Numpy macOS Arm64
644644
run_on:
645645
- macos-14-arm64
646-
tags: [binary-vector]
646+
tags: [binary, vector]
647647
- name: test-numpy-win64
648648
tasks:
649-
- name: test-numpy
649+
- name: .test-numpy
650650
display_name: Test Numpy Win64
651651
run_on:
652652
- windows-64-vsMulti-small
653-
tags: [binary-vector]
653+
tags: [binary, vector]
654654
- name: test-numpy-win32
655655
tasks:
656-
- name: test-numpy
656+
- name: .test-numpy
657657
display_name: Test Numpy Win32
658658
run_on:
659659
- windows-64-vsMulti-small
660660
expansions:
661661
IS_WIN32: "1"
662-
tags: [binary-vector]
662+
tags: [binary, vector]

.evergreen/scripts/generate_config.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,9 @@ def create_disable_test_commands_variants():
342342
def create_test_numpy_tasks():
343343
tasks = []
344344
for python in [*MIN_MAX_PYTHON, PYPYS[-1]]:
345-
name = python if python.startswith("pypy") else f"py{python}"
346-
task_name = f"test-numpy {name}"
345+
tags = ["binary", "vector", f"python-{python}"]
346+
task_name = get_task_name("test-numpy", python=python)
347347
test_func = FunctionCall(func="test numpy", vars=dict(TOOLCHAIN_VERSION=python))
348-
tags = ["binary", "vector"]
349348
tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
350349
return tasks
351350

@@ -356,9 +355,9 @@ def create_test_numpy_variants() -> list[BuildVariant]:
356355

357356
# Test a subset on each of the other platforms.
358357
for host_name in ("rhel8", "macos", "macos-arm64", "win64", "win32"):
359-
tasks = ["test-numpy"]
358+
tasks = [".test-numpy"]
360359
host = HOSTS[host_name]
361-
tags = ["binary-vector"]
360+
tags = ["binary", "vector"]
362361
expansions = dict()
363362
if host_name == "win32":
364363
expansions["IS_WIN32"] = "1"

0 commit comments

Comments
 (0)