@@ -2081,10 +2081,10 @@ axes:
20812081 batchtime : 10080 # 7 days
20822082 - id : rhel8
20832083 display_name : " RHEL 8.x"
2084- run_on : rhel87 -small
2084+ run_on : rhel8.8 -small
20852085 batchtime : 10080 # 7 days
2086- - id : rhel92 -fips
2087- display_name : " RHEL 9.2 FIPS"
2086+ - id : rhel9 -fips
2087+ display_name : " RHEL 9 FIPS"
20882088 run_on : rhel92-fips
20892089 batchtime : 10080 # 7 days
20902090 - id : ubuntu-22.04
@@ -2095,24 +2095,24 @@ axes:
20952095 display_name : " Ubuntu 20.04"
20962096 run_on : ubuntu2004-small
20972097 batchtime : 10080 # 7 days
2098- - id : rhel83 -zseries
2099- display_name : " RHEL 8.3 (zSeries)"
2100- run_on : rhel83 -zseries-small
2098+ - id : rhel8 -zseries
2099+ display_name : " RHEL 8 (zSeries)"
2100+ run_on : rhel8 -zseries-small
21012101 batchtime : 10080 # 7 days
21022102 variables :
21032103 SKIP_HATCH : true
2104- - id : rhel81 -power8
2105- display_name : " RHEL 8.1 (POWER8)"
2106- run_on : rhel81-power8 -small
2104+ - id : rhel8 -power8
2105+ display_name : " RHEL 8 (POWER8)"
2106+ run_on : rhel8-power -small
21072107 batchtime : 10080 # 7 days
21082108 variables :
21092109 SKIP_HATCH : true
2110- - id : rhel82 -arm64
2111- display_name : " RHEL 8.2 (ARM64)"
2110+ - id : rhel8 -arm64
2111+ display_name : " RHEL 8 (ARM64)"
21122112 run_on : rhel82-arm64-small
21132113 batchtime : 10080 # 7 days
21142114 variables :
2115- - id : windows-64-vsMulti-small
2115+ - id : windows
21162116 display_name : " Windows 64"
21172117 run_on : windows-64-vsMulti-small
21182118 batchtime : 10080 # 7 days
@@ -2470,7 +2470,7 @@ buildvariants:
24702470- matrix_name : " tests-fips"
24712471 matrix_spec :
24722472 platform :
2473- - rhel92 -fips
2473+ - rhel9 -fips
24742474 auth : " auth"
24752475 ssl : " ssl"
24762476 display_name : " ${platform} ${auth} ${ssl}"
@@ -2547,9 +2547,9 @@ buildvariants:
25472547- matrix_name : " test-different-cpu-architectures"
25482548 matrix_spec :
25492549 platform :
2550- - rhel83 -zseries # Added in 5.0.8 (SERVER-44074)
2551- - rhel81 -power8 # Added in 4.2.7 (SERVER-44072)
2552- - rhel82 -arm64 # Added in 4.4.2 (SERVER-48282)
2550+ - rhel8 -zseries # Added in 5.0.8 (SERVER-44074)
2551+ - rhel8 -power8 # Added in 4.2.7 (SERVER-44072)
2552+ - rhel8 -arm64 # Added in 4.4.2 (SERVER-48282)
25532553 auth-ssl : " *"
25542554 display_name : " ${platform} ${auth-ssl}"
25552555 tasks :
@@ -2606,7 +2606,7 @@ buildvariants:
26062606
26072607- matrix_name : " tests-pyopenssl-windows"
26082608 matrix_spec :
2609- platform : windows-64-vsMulti-small
2609+ platform : windows
26102610 python-version-windows : " *"
26112611 auth : " auth"
26122612 ssl : " ssl"
@@ -2698,15 +2698,15 @@ buildvariants:
26982698
26992699- matrix_name : " tests-windows-python-version"
27002700 matrix_spec :
2701- platform : windows-64-vsMulti-small
2701+ platform : windows
27022702 python-version-windows : " *"
27032703 auth-ssl : " *"
27042704 display_name : " ${platform} ${python-version-windows} ${auth-ssl}"
27052705 tasks : *all-server-versions
27062706
27072707- matrix_name : " tests-windows-python-version-32-bit"
27082708 matrix_spec :
2709- platform : windows-64-vsMulti-small
2709+ platform : windows
27102710 python-version-windows-32 : " *"
27112711 auth-ssl : " *"
27122712 display_name : " ${platform} ${python-version-windows-32} ${auth-ssl}"
@@ -2724,7 +2724,7 @@ buildvariants:
27242724
27252725- matrix_name : " tests-windows-encryption"
27262726 matrix_spec :
2727- platform : windows-64-vsMulti-small
2727+ platform : windows
27282728 python-version-windows : " *"
27292729 auth-ssl : " *"
27302730 encryption : " *"
@@ -2733,7 +2733,7 @@ buildvariants:
27332733 rules :
27342734 - if :
27352735 encryption : ["encryption", "encryption_crypt_shared"]
2736- platform : windows-64-vsMulti-small
2736+ platform : windows
27372737 python-version-windows : " *"
27382738 auth-ssl : " *"
27392739 then :
@@ -2795,7 +2795,7 @@ buildvariants:
27952795
27962796- matrix_name : " tests-windows-enterprise-auth"
27972797 matrix_spec :
2798- platform : windows-64-vsMulti-small
2798+ platform : windows
27992799 python-version-windows : " *"
28002800 auth : " auth"
28012801 display_name : " Enterprise ${auth} ${platform} ${python-version-windows}"
@@ -2907,7 +2907,7 @@ buildvariants:
29072907
29082908- matrix_name : " ocsp-test-windows"
29092909 matrix_spec :
2910- platform : windows-64-vsMulti-small
2910+ platform : windows
29112911 python-version-windows : ["3.8", "3.10"]
29122912 mongodb-version : ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"]
29132913 auth : " noauth"
@@ -2932,7 +2932,7 @@ buildvariants:
29322932
29332933- matrix_name : " oidc-auth-test"
29342934 matrix_spec :
2935- platform : [ rhel8, macos, windows-64-vsMulti-small ]
2935+ platform : [ rhel8, macos, windows ]
29362936 display_name : " OIDC Auth ${platform}"
29372937 tasks :
29382938 - name : testoidc_task_group
@@ -2981,7 +2981,7 @@ buildvariants:
29812981
29822982- matrix_name : " aws-auth-test-windows"
29832983 matrix_spec :
2984- platform : [windows-64-vsMulti-small ]
2984+ platform : [windows]
29852985 python-version-windows : " *"
29862986 display_name : " MONGODB-AWS Auth ${platform} ${python-version-windows}"
29872987 tasks :
0 commit comments