Skip to content

PYTHON-5697 - Migrate 8.0+ tests to Windows 2022 #2681

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
NoahStapp merged 2 commits into from
Jan 20, 2026
Merged

PYTHON-5697 - Migrate 8.0+ tests to Windows 2022 #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9687be8
PYTHON-5697 - Migrate 8.0+ tests to Windows 2022
NoahStapp Jan 16, 2026
6f998e5
Fix host
NoahStapp Jan 20, 2026
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
18 changes: 9 additions & 9 deletions .evergreen/generated_configs/variants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ buildvariants:
- name: .auth-aws !.auth-aws-ecs
display_name: Auth AWS Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
tags: []
- name: auth-aws-macos
tasks:
Expand Down Expand Up @@ -199,7 +199,7 @@ buildvariants:
- name: .test-non-standard !.pypy
display_name: Encryption Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
batchtime: 1440
expansions:
TEST_NAME: encryption
Expand Down Expand Up @@ -231,7 +231,7 @@ buildvariants:
- name: .test-non-standard !.pypy
display_name: Encryption crypt_shared Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
batchtime: 1440
expansions:
TEST_NAME: encryption
Expand Down Expand Up @@ -273,7 +273,7 @@ buildvariants:
- name: .test-standard-auth !.pypy .auth
display_name: Auth Enterprise Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
expansions:
TEST_NAME: enterprise_auth
AUTH: auth
Expand Down Expand Up @@ -384,7 +384,7 @@ buildvariants:
- name: .ocsp-rsa !.ocsp-staple .4.4
display_name: OCSP Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
batchtime: 10080
- name: ocsp-macos
tasks:
Expand Down Expand Up @@ -423,7 +423,7 @@ buildvariants:
- name: "!.auth_oidc_remote .auth_oidc"
display_name: Auth OIDC Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
batchtime: 1440

# Perf tests
Expand Down Expand Up @@ -462,7 +462,7 @@ buildvariants:
- name: .test-standard !.pypy .async .replica_set-noauth-ssl
display_name: PyOpenSSL Win64
run_on:
- rhel87-small
- windows-2022-latest-small
batchtime: 1440
expansions:
SUB_TEST_NAME: pyopenssl
Expand Down Expand Up @@ -606,7 +606,7 @@ buildvariants:
- name: .test-standard !.pypy
display_name: "* Test Win64"
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
tags: [standard-non-linux]
- name: test-win32
tasks:
Expand Down Expand Up @@ -655,7 +655,7 @@ buildvariants:
- name: .test-numpy
display_name: Test Numpy Win64
run_on:
- windows-64-vsMulti-small
- windows-2022-latest-small
tags: [binary, vector]
- name: test-numpy-win32
tasks:
Expand Down
9 changes: 9 additions & 0 deletions .evergreen/scripts/generate_config_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class Host:
# Hosts with toolchains.
HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8", dict())
HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64", dict())
HOSTS["win-latest"] = Host("win-latest", "windows-2022-latest-small", "WinLatest", dict())
HOSTS["win32"] = Host("win32", "windows-64-vsMulti-small", "Win32", dict())
HOSTS["macos"] = Host("macos", "macos-14", "macOS", dict())
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS Arm64", dict())
Expand Down Expand Up @@ -139,6 +140,14 @@ def create_variant(
expansions = expansions and expansions.copy() or dict()
if version:
expansions["VERSION"] = version
# 8.0+ Windows builds must run on win-latest
if (
"win64" in display_name.lower()
or "win32" in display_name.lower()
and version
and version >= "8.0"
):
kwargs["run_on"] = HOSTS["win-latest"].run_on
return create_variant_generic(
tasks, display_name, version=version, host=host, expansions=expansions, **kwargs
)
Expand Down
Loading