Skip to content

Commit 892212c

Browse files
committed
PYTHON-4893 Use shrub.py for aws auth tests
1 parent 25de52a commit 892212c

File tree

2 files changed

+107
-42
lines changed

2 files changed

+107
-42
lines changed

.evergreen/config.yml

Lines changed: 86 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3491,6 +3491,92 @@ buildvariants:
34913491
SSL: ssl
34923492
PYTHON_BINARY: /opt/python/3.13/bin/python3
34933493

3494+
# AWS Auth tests.
3495+
- name: aws-auth-rhel8-py3.9
3496+
tasks:
3497+
- name: aws-auth-test-4.4
3498+
- name: aws-auth-test-5.0
3499+
- name: aws-auth-test-6.0
3500+
- name: aws-auth-test-7.0
3501+
- name: aws-auth-test-8.0
3502+
- name: aws-auth-test-rapid
3503+
- name: aws-auth-test-latest
3504+
display_name: AWS Auth RHEL8 py3.9
3505+
run_on:
3506+
- rhel87-small
3507+
expansions:
3508+
PYTHON_BINARY: /opt/python/3.9/bin/python3
3509+
- name: aws-auth-rhel8-py3.13
3510+
tasks:
3511+
- name: aws-auth-test-4.4
3512+
- name: aws-auth-test-5.0
3513+
- name: aws-auth-test-6.0
3514+
- name: aws-auth-test-7.0
3515+
- name: aws-auth-test-8.0
3516+
- name: aws-auth-test-rapid
3517+
- name: aws-auth-test-latest
3518+
display_name: AWS Auth RHEL8 py3.13
3519+
run_on:
3520+
- rhel87-small
3521+
expansions:
3522+
PYTHON_BINARY: /opt/python/3.13/bin/python3
3523+
- name: aws-auth-win64-py3.9
3524+
tasks:
3525+
- name: aws-auth-test-4.4
3526+
- name: aws-auth-test-5.0
3527+
- name: aws-auth-test-6.0
3528+
- name: aws-auth-test-7.0
3529+
- name: aws-auth-test-8.0
3530+
- name: aws-auth-test-rapid
3531+
- name: aws-auth-test-latest
3532+
display_name: AWS Auth Win64 py3.9
3533+
run_on:
3534+
- windows-64-vsMulti-small
3535+
expansions:
3536+
PYTHON_BINARY: C:/python/Python39/python.exe
3537+
- name: aws-auth-win64-py3.13
3538+
tasks:
3539+
- name: aws-auth-test-4.4
3540+
- name: aws-auth-test-5.0
3541+
- name: aws-auth-test-6.0
3542+
- name: aws-auth-test-7.0
3543+
- name: aws-auth-test-8.0
3544+
- name: aws-auth-test-rapid
3545+
- name: aws-auth-test-latest
3546+
display_name: AWS Auth Win64 py3.13
3547+
run_on:
3548+
- windows-64-vsMulti-small
3549+
expansions:
3550+
PYTHON_BINARY: C:/python/Python313/python.exe
3551+
- name: aws-auth-macos-py3.9
3552+
tasks:
3553+
- name: aws-auth-test-4.4
3554+
- name: aws-auth-test-5.0
3555+
- name: aws-auth-test-6.0
3556+
- name: aws-auth-test-7.0
3557+
- name: aws-auth-test-8.0
3558+
- name: aws-auth-test-rapid
3559+
- name: aws-auth-test-latest
3560+
display_name: AWS Auth macOS py3.9
3561+
run_on:
3562+
- macos-14
3563+
expansions:
3564+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
3565+
- name: aws-auth-macos-py3.13
3566+
tasks:
3567+
- name: aws-auth-test-4.4
3568+
- name: aws-auth-test-5.0
3569+
- name: aws-auth-test-6.0
3570+
- name: aws-auth-test-7.0
3571+
- name: aws-auth-test-8.0
3572+
- name: aws-auth-test-rapid
3573+
- name: aws-auth-test-latest
3574+
display_name: AWS Auth macOS py3.13
3575+
run_on:
3576+
- macos-14
3577+
expansions:
3578+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
3579+
34943580
- matrix_name: "tests-fips"
34953581
matrix_spec:
34963582
platform:
@@ -3933,47 +4019,6 @@ buildvariants:
39334019
- name: testgcpoidc_task_group
39344020
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
39354021

3936-
- matrix_name: "aws-auth-test"
3937-
matrix_spec:
3938-
platform: [ubuntu-20.04]
3939-
python-version: ["3.9"]
3940-
display_name: "MONGODB-AWS Auth ${platform} ${python-version}"
3941-
tasks:
3942-
- name: "aws-auth-test-4.4"
3943-
- name: "aws-auth-test-5.0"
3944-
- name: "aws-auth-test-6.0"
3945-
- name: "aws-auth-test-7.0"
3946-
- name: "aws-auth-test-8.0"
3947-
- name: "aws-auth-test-rapid"
3948-
- name: "aws-auth-test-latest"
3949-
3950-
- matrix_name: "aws-auth-test-mac"
3951-
matrix_spec:
3952-
platform: [macos]
3953-
display_name: "MONGODB-AWS Auth ${platform} ${python-version-mac}"
3954-
tasks:
3955-
- name: "aws-auth-test-4.4"
3956-
- name: "aws-auth-test-5.0"
3957-
- name: "aws-auth-test-6.0"
3958-
- name: "aws-auth-test-7.0"
3959-
- name: "aws-auth-test-8.0"
3960-
- name: "aws-auth-test-rapid"
3961-
- name: "aws-auth-test-latest"
3962-
3963-
- matrix_name: "aws-auth-test-windows"
3964-
matrix_spec:
3965-
platform: [windows]
3966-
python-version-windows: "*"
3967-
display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}"
3968-
tasks:
3969-
- name: "aws-auth-test-4.4"
3970-
- name: "aws-auth-test-5.0"
3971-
- name: "aws-auth-test-6.0"
3972-
- name: "aws-auth-test-7.0"
3973-
- name: "aws-auth-test-8.0"
3974-
- name: "aws-auth-test-rapid"
3975-
- name: "aws-auth-test-latest"
3976-
39774022
- name: testgcpkms-variant
39784023
display_name: "GCP KMS"
39794024
run_on:

.evergreen/scripts/generate_config.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,30 @@ def generate_serverless_variants():
606606
]
607607

608608

609+
def generate_aws_auth_variants():
610+
variants = []
611+
tasks = [
612+
"aws-auth-test-4.4",
613+
"aws-auth-test-5.0",
614+
"aws-auth-test-6.0",
615+
"aws-auth-test-7.0",
616+
"aws-auth-test-8.0",
617+
"aws-auth-test-rapid",
618+
"aws-auth-test-latest",
619+
]
620+
621+
for host, python in product(["rhel8", "win64", "macos"], MIN_MAX_PYTHON):
622+
variant = create_variant(
623+
tasks, get_display_name("AWS Auth", host, python=python), host=host, python=python
624+
)
625+
variants.append(variant)
626+
return variants
627+
628+
609629
##################
610630
# Generate Config
611631
##################
612632

613-
variants = generate_serverless_variants()
633+
variants = generate_aws_auth_variants()
614634
# print(len(variants))
615635
generate_yaml(variants=variants)

0 commit comments

Comments
 (0)