Skip to content

Commit e10ea66

Browse files
committed
compress matrix
1 parent 2db6ba5 commit e10ea66

File tree

2 files changed

+15
-35
lines changed

2 files changed

+15
-35
lines changed

.evergreen/config.yml

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3195,15 +3195,15 @@ buildvariants:
31953195
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
31963196

31973197
# Enterprise auth tests.
3198-
- name: enterprise-auth-rhel8-py3.9-auth
3198+
- name: enterprise-auth-macos-py3.9-auth
31993199
tasks:
32003200
- name: test-enterprise-auth
3201-
display_name: Enterprise Auth RHEL8 py3.9 Auth
3201+
display_name: Enterprise Auth macOS py3.9 Auth
32023202
run_on:
3203-
- rhel87-small
3203+
- macos-14
32043204
expansions:
32053205
AUTH: auth
3206-
PYTHON_BINARY: /opt/python/3.9/bin/python3
3206+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
32073207
- name: enterprise-auth-rhel8-py3.10-auth
32083208
tasks:
32093209
- name: test-enterprise-auth
@@ -3231,15 +3231,15 @@ buildvariants:
32313231
expansions:
32323232
AUTH: auth
32333233
PYTHON_BINARY: /opt/python/3.12/bin/python3
3234-
- name: enterprise-auth-rhel8-py3.13-auth
3234+
- name: enterprise-auth-win64-py3.13-auth
32353235
tasks:
32363236
- name: test-enterprise-auth
3237-
display_name: Enterprise Auth RHEL8 py3.13 Auth
3237+
display_name: Enterprise Auth Win64 py3.13 Auth
32383238
run_on:
3239-
- rhel87-small
3239+
- windows-64-vsMulti-small
32403240
expansions:
32413241
AUTH: auth
3242-
PYTHON_BINARY: /opt/python/3.13/bin/python3
3242+
PYTHON_BINARY: C:/python/Python313/python.exe
32433243
- name: enterprise-auth-rhel8-pypy3.9-auth
32443244
tasks:
32453245
- name: test-enterprise-auth
@@ -3258,24 +3258,6 @@ buildvariants:
32583258
expansions:
32593259
AUTH: auth
32603260
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
3261-
- name: enterprise-auth-win64-py3.9-auth
3262-
tasks:
3263-
- name: test-enterprise-auth
3264-
display_name: Enterprise Auth Win64 py3.9 Auth
3265-
run_on:
3266-
- windows-64-vsMulti-small
3267-
expansions:
3268-
AUTH: auth
3269-
PYTHON_BINARY: C:/python/Python39/python.exe
3270-
- name: enterprise-auth-win64-py3.13-auth
3271-
tasks:
3272-
- name: test-enterprise-auth
3273-
display_name: Enterprise Auth Win64 py3.13 Auth
3274-
run_on:
3275-
- windows-64-vsMulti-small
3276-
expansions:
3277-
AUTH: auth
3278-
PYTHON_BINARY: C:/python/Python313/python.exe
32793261

32803262
- matrix_name: "tests-fips"
32813263
matrix_spec:

.evergreen/scripts/generate_config.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -388,22 +388,20 @@ def create_enterprise_auth_variants():
388388
expansions = dict(AUTH="auth")
389389
variants = []
390390

391-
# All python versions on linux, min and max on Windows.
392-
host = "rhel8"
391+
# All python versions across platforms.
393392
for python in ALL_PYTHONS:
393+
if python == CPYTHONS[0]:
394+
host = "macos"
395+
elif python == CPYTHONS[-1]:
396+
host = "win64"
397+
else:
398+
host = "rhel8"
394399
display_name = get_display_name("Enterprise Auth", host, python=python, **expansions)
395400
variant = create_variant(
396401
["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
397402
)
398403
variants.append(variant)
399404

400-
host = "win64"
401-
for python in MIN_MAX_PYTHON:
402-
display_name = get_display_name("Enterprise Auth", host, python=python, **expansions)
403-
variant = create_variant(
404-
["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
405-
)
406-
variants.append(variant)
407405
return variants
408406

409407

0 commit comments

Comments
 (0)