@@ -2081,10 +2081,10 @@ axes:
2081
2081
batchtime : 10080 # 7 days
2082
2082
- id : rhel8
2083
2083
display_name : " RHEL 8.x"
2084
- run_on : rhel87 -small
2084
+ run_on : rhel8.8 -small
2085
2085
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"
2088
2088
run_on : rhel92-fips
2089
2089
batchtime : 10080 # 7 days
2090
2090
- id : ubuntu-22.04
@@ -2095,24 +2095,24 @@ axes:
2095
2095
display_name : " Ubuntu 20.04"
2096
2096
run_on : ubuntu2004-small
2097
2097
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
2101
2101
batchtime : 10080 # 7 days
2102
2102
variables :
2103
2103
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
2107
2107
batchtime : 10080 # 7 days
2108
2108
variables :
2109
2109
SKIP_HATCH : true
2110
- - id : rhel82 -arm64
2111
- display_name : " RHEL 8.2 (ARM64)"
2110
+ - id : rhel8 -arm64
2111
+ display_name : " RHEL 8 (ARM64)"
2112
2112
run_on : rhel82-arm64-small
2113
2113
batchtime : 10080 # 7 days
2114
2114
variables :
2115
- - id : windows-64-vsMulti-small
2115
+ - id : windows
2116
2116
display_name : " Windows 64"
2117
2117
run_on : windows-64-vsMulti-small
2118
2118
batchtime : 10080 # 7 days
@@ -2470,7 +2470,7 @@ buildvariants:
2470
2470
- matrix_name : " tests-fips"
2471
2471
matrix_spec :
2472
2472
platform :
2473
- - rhel92 -fips
2473
+ - rhel9 -fips
2474
2474
auth : " auth"
2475
2475
ssl : " ssl"
2476
2476
display_name : " ${platform} ${auth} ${ssl}"
@@ -2547,9 +2547,9 @@ buildvariants:
2547
2547
- matrix_name : " test-different-cpu-architectures"
2548
2548
matrix_spec :
2549
2549
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)
2553
2553
auth-ssl : " *"
2554
2554
display_name : " ${platform} ${auth-ssl}"
2555
2555
tasks :
@@ -2606,7 +2606,7 @@ buildvariants:
2606
2606
2607
2607
- matrix_name : " tests-pyopenssl-windows"
2608
2608
matrix_spec :
2609
- platform : windows-64-vsMulti-small
2609
+ platform : windows
2610
2610
python-version-windows : " *"
2611
2611
auth : " auth"
2612
2612
ssl : " ssl"
@@ -2698,15 +2698,15 @@ buildvariants:
2698
2698
2699
2699
- matrix_name : " tests-windows-python-version"
2700
2700
matrix_spec :
2701
- platform : windows-64-vsMulti-small
2701
+ platform : windows
2702
2702
python-version-windows : " *"
2703
2703
auth-ssl : " *"
2704
2704
display_name : " ${platform} ${python-version-windows} ${auth-ssl}"
2705
2705
tasks : *all-server-versions
2706
2706
2707
2707
- matrix_name : " tests-windows-python-version-32-bit"
2708
2708
matrix_spec :
2709
- platform : windows-64-vsMulti-small
2709
+ platform : windows
2710
2710
python-version-windows-32 : " *"
2711
2711
auth-ssl : " *"
2712
2712
display_name : " ${platform} ${python-version-windows-32} ${auth-ssl}"
@@ -2724,7 +2724,7 @@ buildvariants:
2724
2724
2725
2725
- matrix_name : " tests-windows-encryption"
2726
2726
matrix_spec :
2727
- platform : windows-64-vsMulti-small
2727
+ platform : windows
2728
2728
python-version-windows : " *"
2729
2729
auth-ssl : " *"
2730
2730
encryption : " *"
@@ -2733,7 +2733,7 @@ buildvariants:
2733
2733
rules :
2734
2734
- if :
2735
2735
encryption : ["encryption", "encryption_crypt_shared"]
2736
- platform : windows-64-vsMulti-small
2736
+ platform : windows
2737
2737
python-version-windows : " *"
2738
2738
auth-ssl : " *"
2739
2739
then :
@@ -2795,7 +2795,7 @@ buildvariants:
2795
2795
2796
2796
- matrix_name : " tests-windows-enterprise-auth"
2797
2797
matrix_spec :
2798
- platform : windows-64-vsMulti-small
2798
+ platform : windows
2799
2799
python-version-windows : " *"
2800
2800
auth : " auth"
2801
2801
display_name : " Enterprise ${auth} ${platform} ${python-version-windows}"
@@ -2907,7 +2907,7 @@ buildvariants:
2907
2907
2908
2908
- matrix_name : " ocsp-test-windows"
2909
2909
matrix_spec :
2910
- platform : windows-64-vsMulti-small
2910
+ platform : windows
2911
2911
python-version-windows : ["3.8", "3.10"]
2912
2912
mongodb-version : ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"]
2913
2913
auth : " noauth"
@@ -2932,7 +2932,7 @@ buildvariants:
2932
2932
2933
2933
- matrix_name : " oidc-auth-test"
2934
2934
matrix_spec :
2935
- platform : [ rhel8, macos, windows-64-vsMulti-small ]
2935
+ platform : [ rhel8, macos, windows ]
2936
2936
display_name : " OIDC Auth ${platform}"
2937
2937
tasks :
2938
2938
- name : testoidc_task_group
@@ -2981,7 +2981,7 @@ buildvariants:
2981
2981
2982
2982
- matrix_name : " aws-auth-test-windows"
2983
2983
matrix_spec :
2984
- platform : [windows-64-vsMulti-small ]
2984
+ platform : [windows]
2985
2985
python-version-windows : " *"
2986
2986
display_name : " MONGODB-AWS Auth ${platform} ${python-version-windows}"
2987
2987
tasks :
0 commit comments