From 9687be88b5b0ca81554c4301e2bff41226c9622f Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Fri, 16 Jan 2026 12:27:55 -0500 Subject: [PATCH 1/2] PYTHON-5697 - Migrate 8.0+ tests to Windows 2022 --- .evergreen/generated_configs/variants.yml | 18 +++++++++--------- .evergreen/scripts/generate_config_utils.py | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 1b0c3fc734..18272f0b4e 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -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 tags: [] - name: auth-aws-macos tasks: @@ -199,7 +199,7 @@ buildvariants: - name: .test-non-standard !.pypy display_name: Encryption Win64 run_on: - - windows-64-vsMulti-small + - windows-2022-latest batchtime: 1440 expansions: TEST_NAME: encryption @@ -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 batchtime: 1440 expansions: TEST_NAME: encryption @@ -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 expansions: TEST_NAME: enterprise_auth AUTH: auth @@ -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 batchtime: 10080 - name: ocsp-macos tasks: @@ -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 batchtime: 1440 # Perf tests @@ -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 batchtime: 1440 expansions: SUB_TEST_NAME: pyopenssl @@ -606,7 +606,7 @@ buildvariants: - name: .test-standard !.pypy display_name: "* Test Win64" run_on: - - windows-64-vsMulti-small + - windows-2022-latest tags: [standard-non-linux] - name: test-win32 tasks: @@ -655,7 +655,7 @@ buildvariants: - name: .test-numpy display_name: Test Numpy Win64 run_on: - - windows-64-vsMulti-small + - windows-2022-latest tags: [binary, vector] - name: test-numpy-win32 tasks: diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index 573afa36ea..36bbe96010 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -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", "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()) @@ -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 ) From 6f998e56bb1cf9c5bc2edc7a003b1cd65bbe86f3 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 20 Jan 2026 09:15:38 -0500 Subject: [PATCH 2/2] Fix host --- .evergreen/generated_configs/variants.yml | 18 +++++++++--------- .evergreen/scripts/generate_config_utils.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml index 18272f0b4e..1d8275d148 100644 --- a/.evergreen/generated_configs/variants.yml +++ b/.evergreen/generated_configs/variants.yml @@ -82,7 +82,7 @@ buildvariants: - name: .auth-aws !.auth-aws-ecs display_name: Auth AWS Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small tags: [] - name: auth-aws-macos tasks: @@ -199,7 +199,7 @@ buildvariants: - name: .test-non-standard !.pypy display_name: Encryption Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small batchtime: 1440 expansions: TEST_NAME: encryption @@ -231,7 +231,7 @@ buildvariants: - name: .test-non-standard !.pypy display_name: Encryption crypt_shared Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small batchtime: 1440 expansions: TEST_NAME: encryption @@ -273,7 +273,7 @@ buildvariants: - name: .test-standard-auth !.pypy .auth display_name: Auth Enterprise Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small expansions: TEST_NAME: enterprise_auth AUTH: auth @@ -384,7 +384,7 @@ buildvariants: - name: .ocsp-rsa !.ocsp-staple .4.4 display_name: OCSP Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small batchtime: 10080 - name: ocsp-macos tasks: @@ -423,7 +423,7 @@ buildvariants: - name: "!.auth_oidc_remote .auth_oidc" display_name: Auth OIDC Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small batchtime: 1440 # Perf tests @@ -462,7 +462,7 @@ buildvariants: - name: .test-standard !.pypy .async .replica_set-noauth-ssl display_name: PyOpenSSL Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small batchtime: 1440 expansions: SUB_TEST_NAME: pyopenssl @@ -606,7 +606,7 @@ buildvariants: - name: .test-standard !.pypy display_name: "* Test Win64" run_on: - - windows-2022-latest + - windows-2022-latest-small tags: [standard-non-linux] - name: test-win32 tasks: @@ -655,7 +655,7 @@ buildvariants: - name: .test-numpy display_name: Test Numpy Win64 run_on: - - windows-2022-latest + - windows-2022-latest-small tags: [binary, vector] - name: test-numpy-win32 tasks: diff --git a/.evergreen/scripts/generate_config_utils.py b/.evergreen/scripts/generate_config_utils.py index 36bbe96010..1ed2e8f811 100644 --- a/.evergreen/scripts/generate_config_utils.py +++ b/.evergreen/scripts/generate_config_utils.py @@ -59,7 +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", "WinLatest", 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())