Skip to content

Commit 12b3859

Browse files
authored
PYTHON-5697 - Migrate 8.0+ tests to Windows 2022 (#2681)
1 parent b88415b commit 12b3859

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

.evergreen/generated_configs/variants.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ buildvariants:
8282
- name: .auth-aws !.auth-aws-ecs
8383
display_name: Auth AWS Win64
8484
run_on:
85-
- windows-64-vsMulti-small
85+
- windows-2022-latest-small
8686
tags: []
8787
- name: auth-aws-macos
8888
tasks:
@@ -199,7 +199,7 @@ buildvariants:
199199
- name: .test-non-standard !.pypy
200200
display_name: Encryption Win64
201201
run_on:
202-
- windows-64-vsMulti-small
202+
- windows-2022-latest-small
203203
batchtime: 1440
204204
expansions:
205205
TEST_NAME: encryption
@@ -231,7 +231,7 @@ buildvariants:
231231
- name: .test-non-standard !.pypy
232232
display_name: Encryption crypt_shared Win64
233233
run_on:
234-
- windows-64-vsMulti-small
234+
- windows-2022-latest-small
235235
batchtime: 1440
236236
expansions:
237237
TEST_NAME: encryption
@@ -273,7 +273,7 @@ buildvariants:
273273
- name: .test-standard-auth !.pypy .auth
274274
display_name: Auth Enterprise Win64
275275
run_on:
276-
- windows-64-vsMulti-small
276+
- windows-2022-latest-small
277277
expansions:
278278
TEST_NAME: enterprise_auth
279279
AUTH: auth
@@ -384,7 +384,7 @@ buildvariants:
384384
- name: .ocsp-rsa !.ocsp-staple .4.4
385385
display_name: OCSP Win64
386386
run_on:
387-
- windows-64-vsMulti-small
387+
- windows-2022-latest-small
388388
batchtime: 10080
389389
- name: ocsp-macos
390390
tasks:
@@ -423,7 +423,7 @@ buildvariants:
423423
- name: "!.auth_oidc_remote .auth_oidc"
424424
display_name: Auth OIDC Win64
425425
run_on:
426-
- windows-64-vsMulti-small
426+
- windows-2022-latest-small
427427
batchtime: 1440
428428

429429
# Perf tests
@@ -462,7 +462,7 @@ buildvariants:
462462
- name: .test-standard !.pypy .async .replica_set-noauth-ssl
463463
display_name: PyOpenSSL Win64
464464
run_on:
465-
- rhel87-small
465+
- windows-2022-latest-small
466466
batchtime: 1440
467467
expansions:
468468
SUB_TEST_NAME: pyopenssl
@@ -606,7 +606,7 @@ buildvariants:
606606
- name: .test-standard !.pypy
607607
display_name: "* Test Win64"
608608
run_on:
609-
- windows-64-vsMulti-small
609+
- windows-2022-latest-small
610610
tags: [standard-non-linux]
611611
- name: test-win32
612612
tasks:
@@ -655,7 +655,7 @@ buildvariants:
655655
- name: .test-numpy
656656
display_name: Test Numpy Win64
657657
run_on:
658-
- windows-64-vsMulti-small
658+
- windows-2022-latest-small
659659
tags: [binary, vector]
660660
- name: test-numpy-win32
661661
tasks:

.evergreen/scripts/generate_config_utils.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class Host:
5959
# Hosts with toolchains.
6060
HOSTS["rhel8"] = Host("rhel8", "rhel87-small", "RHEL8", dict())
6161
HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64", dict())
62+
HOSTS["win-latest"] = Host("win-latest", "windows-2022-latest-small", "WinLatest", dict())
6263
HOSTS["win32"] = Host("win32", "windows-64-vsMulti-small", "Win32", dict())
6364
HOSTS["macos"] = Host("macos", "macos-14", "macOS", dict())
6465
HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS Arm64", dict())
@@ -139,6 +140,14 @@ def create_variant(
139140
expansions = expansions and expansions.copy() or dict()
140141
if version:
141142
expansions["VERSION"] = version
143+
# 8.0+ Windows builds must run on win-latest
144+
if (
145+
"win64" in display_name.lower()
146+
or "win32" in display_name.lower()
147+
and version
148+
and version >= "8.0"
149+
):
150+
kwargs["run_on"] = HOSTS["win-latest"].run_on
142151
return create_variant_generic(
143152
tasks, display_name, version=version, host=host, expansions=expansions, **kwargs
144153
)

0 commit comments

Comments
 (0)