Skip to content

Commit 69e2543

Browse files
committed
PYTHON-4882 Use shrub.py for enterprise auth tests
1 parent 317a539 commit 69e2543

File tree

2 files changed

+107
-19
lines changed

2 files changed

+107
-19
lines changed

.evergreen/config.yml

Lines changed: 83 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3194,6 +3194,89 @@ buildvariants:
31943194
COMPRESSORS: zstd
31953195
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
31963196

3197+
# Enterprise auth tests.
3198+
- name: enterprise-auth-rhel8-py3.9-auth
3199+
tasks:
3200+
- name: test-enterprise-auth
3201+
display_name: Enterprise Auth RHEL8 py3.9 Auth
3202+
run_on:
3203+
- rhel87-small
3204+
expansions:
3205+
AUTH: auth
3206+
PYTHON_BINARY: /opt/python/3.9/bin/python3
3207+
- name: enterprise-auth-rhel8-py3.10-auth
3208+
tasks:
3209+
- name: test-enterprise-auth
3210+
display_name: Enterprise Auth RHEL8 py3.10 Auth
3211+
run_on:
3212+
- rhel87-small
3213+
expansions:
3214+
AUTH: auth
3215+
PYTHON_BINARY: /opt/python/3.10/bin/python3
3216+
- name: enterprise-auth-rhel8-py3.11-auth
3217+
tasks:
3218+
- name: test-enterprise-auth
3219+
display_name: Enterprise Auth RHEL8 py3.11 Auth
3220+
run_on:
3221+
- rhel87-small
3222+
expansions:
3223+
AUTH: auth
3224+
PYTHON_BINARY: /opt/python/3.11/bin/python3
3225+
- name: enterprise-auth-rhel8-py3.12-auth
3226+
tasks:
3227+
- name: test-enterprise-auth
3228+
display_name: Enterprise Auth RHEL8 py3.12 Auth
3229+
run_on:
3230+
- rhel87-small
3231+
expansions:
3232+
AUTH: auth
3233+
PYTHON_BINARY: /opt/python/3.12/bin/python3
3234+
- name: enterprise-auth-rhel8-py3.13-auth
3235+
tasks:
3236+
- name: test-enterprise-auth
3237+
display_name: Enterprise Auth RHEL8 py3.13 Auth
3238+
run_on:
3239+
- rhel87-small
3240+
expansions:
3241+
AUTH: auth
3242+
PYTHON_BINARY: /opt/python/3.13/bin/python3
3243+
- name: enterprise-auth-rhel8-pypy3.9-auth
3244+
tasks:
3245+
- name: test-enterprise-auth
3246+
display_name: Enterprise Auth RHEL8 pypy3.9 Auth
3247+
run_on:
3248+
- rhel87-small
3249+
expansions:
3250+
AUTH: auth
3251+
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
3252+
- name: enterprise-auth-rhel8-pypy3.10-auth
3253+
tasks:
3254+
- name: test-enterprise-auth
3255+
display_name: Enterprise Auth RHEL8 pypy3.10 Auth
3256+
run_on:
3257+
- rhel87-small
3258+
expansions:
3259+
AUTH: auth
3260+
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
3279+
31973280
- matrix_name: "tests-fips"
31983281
matrix_spec:
31993282
platform:
@@ -3350,24 +3433,6 @@ buildvariants:
33503433
tasks:
33513434
- ".latest"
33523435

3353-
- matrix_name: "test-linux-enterprise-auth"
3354-
matrix_spec:
3355-
platform: rhel8
3356-
python-version: "*"
3357-
auth: "auth"
3358-
display_name: "Enterprise ${auth} ${platform} ${python-version}"
3359-
tasks:
3360-
- name: "test-enterprise-auth"
3361-
3362-
- matrix_name: "tests-windows-enterprise-auth"
3363-
matrix_spec:
3364-
platform: windows
3365-
python-version-windows: "*"
3366-
auth: "auth"
3367-
display_name: "Enterprise ${auth} ${platform} ${python-version-windows}"
3368-
tasks:
3369-
- name: "test-enterprise-auth"
3370-
33713436
- matrix_name: "test-search-index-helpers"
33723437
matrix_spec:
33733438
platform: rhel8

.evergreen/scripts/generate_config.py

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,33 @@ def create_compression_variants():
384384
return variants
385385

386386

387+
def create_enterprise_auth_variants():
388+
expansions = dict(AUTH="auth")
389+
variants = []
390+
391+
# All python versions on linux, min and max on Windows.
392+
host = "rhel8"
393+
for python in ALL_PYTHONS:
394+
display_name = get_display_name("Enterprise Auth", host, python=python, **expansions)
395+
variant = create_variant(
396+
["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
397+
)
398+
variants.append(variant)
399+
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)
407+
return variants
408+
409+
387410
##################
388411
# Generate Config
389412
##################
390413

391-
variants = create_compression_variants()
414+
variants = create_enterprise_auth_variants()
392415
# print(len(variants))
393416
generate_yaml(variants=variants)

0 commit comments

Comments
 (0)