Skip to content

PYTHON-4893 Use shrub.py for aws auth tests #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 21, 2024
Merged

PYTHON-4893 Use shrub.py for aws auth tests #1959

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
892212c
PYTHON-4893 Use shrub.py for aws auth tests
blink1073 Oct 21, 2024
cb39c06
use ubuntu 20
blink1073 Oct 21, 2024
58efc8e
add skip ecs
blink1073 Oct 21, 2024
03b1da6
add skips on macos
blink1073 Oct 21, 2024
23a7eec
add skip ec2
blink1073 Oct 21, 2024
ebf6c22
Merge branch 'master' into PYTHON-4893-aws
blink1073 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 94 additions & 41 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3491,6 +3491,100 @@ buildvariants:
SSL: ssl
PYTHON_BINARY: /opt/python/3.13/bin/python3

# AWS Auth tests.
- name: aws-auth-ubuntu-20-py3.9
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth Ubuntu-20 py3.9
run_on:
- ubuntu2004-small
expansions:
PYTHON_BINARY: /opt/python/3.9/bin/python3
- name: aws-auth-ubuntu-20-py3.13
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth Ubuntu-20 py3.13
run_on:
- ubuntu2004-small
expansions:
PYTHON_BINARY: /opt/python/3.13/bin/python3
- name: aws-auth-win64-py3.9
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth Win64 py3.9
run_on:
- windows-64-vsMulti-small
expansions:
skip_ECS_auth_test: "true"
PYTHON_BINARY: C:/python/Python39/python.exe
- name: aws-auth-win64-py3.13
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth Win64 py3.13
run_on:
- windows-64-vsMulti-small
expansions:
skip_ECS_auth_test: "true"
PYTHON_BINARY: C:/python/Python313/python.exe
- name: aws-auth-macos-py3.9
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth macOS py3.9
run_on:
- macos-14
expansions:
skip_ECS_auth_test: "true"
skip_EC2_auth_test: "true"
skip_web_identity_auth_test: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
- name: aws-auth-macos-py3.13
tasks:
- name: aws-auth-test-4.4
- name: aws-auth-test-5.0
- name: aws-auth-test-6.0
- name: aws-auth-test-7.0
- name: aws-auth-test-8.0
- name: aws-auth-test-rapid
- name: aws-auth-test-latest
display_name: AWS Auth macOS py3.13
run_on:
- macos-14
expansions:
skip_ECS_auth_test: "true"
skip_EC2_auth_test: "true"
skip_web_identity_auth_test: "true"
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3

- matrix_name: "tests-fips"
matrix_spec:
platform:
Expand Down Expand Up @@ -3933,47 +4027,6 @@ buildvariants:
- name: testgcpoidc_task_group
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README

- matrix_name: "aws-auth-test"
matrix_spec:
platform: [ubuntu-20.04]
python-version: ["3.9"]
display_name: "MONGODB-AWS Auth ${platform} ${python-version}"
tasks:
- name: "aws-auth-test-4.4"
- name: "aws-auth-test-5.0"
- name: "aws-auth-test-6.0"
- name: "aws-auth-test-7.0"
- name: "aws-auth-test-8.0"
- name: "aws-auth-test-rapid"
- name: "aws-auth-test-latest"

- matrix_name: "aws-auth-test-mac"
matrix_spec:
platform: [macos]
display_name: "MONGODB-AWS Auth ${platform} ${python-version-mac}"
tasks:
- name: "aws-auth-test-4.4"
- name: "aws-auth-test-5.0"
- name: "aws-auth-test-6.0"
- name: "aws-auth-test-7.0"
- name: "aws-auth-test-8.0"
- name: "aws-auth-test-rapid"
- name: "aws-auth-test-latest"

- matrix_name: "aws-auth-test-windows"
matrix_spec:
platform: [windows]
python-version-windows: "*"
display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}"
tasks:
- name: "aws-auth-test-4.4"
- name: "aws-auth-test-5.0"
- name: "aws-auth-test-6.0"
- name: "aws-auth-test-7.0"
- name: "aws-auth-test-8.0"
- name: "aws-auth-test-rapid"
- name: "aws-auth-test-latest"

- name: testgcpkms-variant
display_name: "GCP KMS"
run_on:
Expand Down
35 changes: 33 additions & 2 deletions .evergreen/scripts/generate_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Host:
HOSTS["win32"] = Host("win32", "windows-64-vsMulti-small", "Win32")
HOSTS["macos"] = Host("macos", "macos-14", "macOS")
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS Arm64")
HOSTS["ubuntu20"] = Host("ubuntu20", "ubuntu2004-small", "Ubuntu-20")
HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22")


Expand Down Expand Up @@ -103,7 +104,7 @@ def get_python_binary(python: str, host: str) -> str:
python = python.replace(".", "")
return f"{base}/Python{python}/python.exe"

if host in ["rhel8", "ubuntu22"]:
if host in ["rhel8", "ubuntu22", "ubuntu20"]:
return f"/opt/python/{python}/bin/python3"

if host in ["macos", "macos-arm64"]:
Expand Down Expand Up @@ -606,10 +607,40 @@ def generate_serverless_variants():
]


def generate_aws_auth_variants():
variants = []
tasks = [
"aws-auth-test-4.4",
"aws-auth-test-5.0",
"aws-auth-test-6.0",
"aws-auth-test-7.0",
"aws-auth-test-8.0",
"aws-auth-test-rapid",
"aws-auth-test-latest",
]

for host, python in product(["ubuntu20", "win64", "macos"], MIN_MAX_PYTHON):
expansions = dict()
if host != "ubuntu20":
expansions["skip_ECS_auth_test"] = "true"
if host == "macos":
expansions["skip_EC2_auth_test"] = "true"
expansions["skip_web_identity_auth_test"] = "true"
variant = create_variant(
tasks,
get_display_name("AWS Auth", host, python=python),
host=host,
python=python,
expansions=expansions,
)
variants.append(variant)
return variants


##################
# Generate Config
##################

variants = generate_serverless_variants()
variants = generate_aws_auth_variants()
# print(len(variants))
generate_yaml(variants=variants)
Loading