Skip to content

Commit 07e030b

Browse files
blink1073blink1073
committed
update matrix
1 parent 4670f24 commit 07e030b

File tree

2 files changed

+41
-48
lines changed

2 files changed

+41
-48
lines changed

‎.evergreen/config.yml

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2827,23 +2827,10 @@ buildvariants:
28272827
- "test-5.0-standalone"
28282828

28292829
# OCSP test matrix.
2830-
- name: ocsp-test-rhel8-v4.0-py3.9
2830+
- name: ocsp-test-rhel8-v4.4-py3.9
28312831
tasks:
28322832
- name: .ocsp
2833-
display_name: OCSP test RHEL8 v4.0 py3.9
2834-
run_on:
2835-
- rhel87-small
2836-
batchtime: 20160
2837-
expansions:
2838-
VERSION: "4.0"
2839-
AUTH: noauth
2840-
SSL: ssl
2841-
TOPOLOGY: server
2842-
PYTHON_BINARY: /opt/python/3.9/bin/python3
2843-
- name: ocsp-test-rhel8-v4.4-py3.10
2844-
tasks:
2845-
- name: .ocsp
2846-
display_name: OCSP test RHEL8 v4.4 py3.10
2833+
display_name: OCSP test RHEL8 v4.4 py3.9
28472834
run_on:
28482835
- rhel87-small
28492836
batchtime: 20160
@@ -2852,11 +2839,11 @@ buildvariants:
28522839
AUTH: noauth
28532840
SSL: ssl
28542841
TOPOLOGY: server
2855-
PYTHON_BINARY: /opt/python/3.10/bin/python3
2856-
- name: ocsp-test-rhel8-v5.0-py3.11
2842+
PYTHON_BINARY: /opt/python/3.9/bin/python3
2843+
- name: ocsp-test-rhel8-v5.0-py3.10
28572844
tasks:
28582845
- name: .ocsp
2859-
display_name: OCSP test RHEL8 v5.0 py3.11
2846+
display_name: OCSP test RHEL8 v5.0 py3.10
28602847
run_on:
28612848
- rhel87-small
28622849
batchtime: 20160
@@ -2865,11 +2852,11 @@ buildvariants:
28652852
AUTH: noauth
28662853
SSL: ssl
28672854
TOPOLOGY: server
2868-
PYTHON_BINARY: /opt/python/3.11/bin/python3
2869-
- name: ocsp-test-rhel8-v6.0-py3.12
2855+
PYTHON_BINARY: /opt/python/3.10/bin/python3
2856+
- name: ocsp-test-rhel8-v6.0-py3.11
28702857
tasks:
28712858
- name: .ocsp
2872-
display_name: OCSP test RHEL8 v6.0 py3.12
2859+
display_name: OCSP test RHEL8 v6.0 py3.11
28732860
run_on:
28742861
- rhel87-small
28752862
batchtime: 20160
@@ -2878,11 +2865,11 @@ buildvariants:
28782865
AUTH: noauth
28792866
SSL: ssl
28802867
TOPOLOGY: server
2881-
PYTHON_BINARY: /opt/python/3.12/bin/python3
2882-
- name: ocsp-test-rhel8-v7.0-py3.13
2868+
PYTHON_BINARY: /opt/python/3.11/bin/python3
2869+
- name: ocsp-test-rhel8-v7.0-py3.12
28832870
tasks:
28842871
- name: .ocsp
2885-
display_name: OCSP test RHEL8 v7.0 py3.13
2872+
display_name: OCSP test RHEL8 v7.0 py3.12
28862873
run_on:
28872874
- rhel87-small
28882875
batchtime: 20160
@@ -2891,11 +2878,11 @@ buildvariants:
28912878
AUTH: noauth
28922879
SSL: ssl
28932880
TOPOLOGY: server
2894-
PYTHON_BINARY: /opt/python/3.13/bin/python3
2895-
- name: ocsp-test-rhel8-v8.0-pypy3.9
2881+
PYTHON_BINARY: /opt/python/3.12/bin/python3
2882+
- name: ocsp-test-rhel8-v8.0-py3.13
28962883
tasks:
28972884
- name: .ocsp
2898-
display_name: OCSP test RHEL8 v8.0 pypy3.9
2885+
display_name: OCSP test RHEL8 v8.0 py3.13
28992886
run_on:
29002887
- rhel87-small
29012888
batchtime: 20160
@@ -2904,11 +2891,11 @@ buildvariants:
29042891
AUTH: noauth
29052892
SSL: ssl
29062893
TOPOLOGY: server
2907-
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
2908-
- name: ocsp-test-rhel8-rapid-pypy3.10
2894+
PYTHON_BINARY: /opt/python/3.13/bin/python3
2895+
- name: ocsp-test-rhel8-rapid-pypy3.9
29092896
tasks:
29102897
- name: .ocsp
2911-
display_name: OCSP test RHEL8 rapid pypy3.10
2898+
display_name: OCSP test RHEL8 rapid pypy3.9
29122899
run_on:
29132900
- rhel87-small
29142901
batchtime: 20160
@@ -2917,11 +2904,11 @@ buildvariants:
29172904
AUTH: noauth
29182905
SSL: ssl
29192906
TOPOLOGY: server
2920-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
2921-
- name: ocsp-test-rhel8-latest-py3.9
2907+
PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
2908+
- name: ocsp-test-rhel8-latest-pypy3.10
29222909
tasks:
29232910
- name: .ocsp
2924-
display_name: OCSP test RHEL8 latest py3.9
2911+
display_name: OCSP test RHEL8 latest pypy3.10
29252912
run_on:
29262913
- rhel87-small
29272914
batchtime: 20160
@@ -2930,11 +2917,11 @@ buildvariants:
29302917
AUTH: noauth
29312918
SSL: ssl
29322919
TOPOLOGY: server
2933-
PYTHON_BINARY: /opt/python/3.9/bin/python3
2934-
- name: ocsp-test-win64-v4.4-py3.9
2920+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
2921+
- name: ocsp-test-win64-v4.4-py3.13
29352922
tasks:
29362923
- name: .ocsp-rsa !.ocsp-staple
2937-
display_name: OCSP test Win64 v4.4 py3.9
2924+
display_name: OCSP test Win64 v4.4 py3.13
29382925
run_on:
29392926
- windows-64-vsMulti-small
29402927
batchtime: 20160
@@ -2943,11 +2930,11 @@ buildvariants:
29432930
AUTH: noauth
29442931
SSL: ssl
29452932
TOPOLOGY: server
2946-
PYTHON_BINARY: C:/python/Python39/python.exe
2947-
- name: ocsp-test-win64-v8.0-py3.9
2933+
PYTHON_BINARY: C:/python/Python313/python.exe
2934+
- name: ocsp-test-win64-v8.0-py3.13
29482935
tasks:
29492936
- name: .ocsp-rsa !.ocsp-staple
2950-
display_name: OCSP test Win64 v8.0 py3.9
2937+
display_name: OCSP test Win64 v8.0 py3.13
29512938
run_on:
29522939
- windows-64-vsMulti-small
29532940
batchtime: 20160
@@ -2956,11 +2943,11 @@ buildvariants:
29562943
AUTH: noauth
29572944
SSL: ssl
29582945
TOPOLOGY: server
2959-
PYTHON_BINARY: C:/python/Python39/python.exe
2960-
- name: ocsp-test-macos-v4.4-py3.9
2946+
PYTHON_BINARY: C:/python/Python313/python.exe
2947+
- name: ocsp-test-macos-v4.4-py3.13
29612948
tasks:
29622949
- name: .ocsp-rsa !.ocsp-staple
2963-
display_name: OCSP test macOS v4.4 py3.9
2950+
display_name: OCSP test macOS v4.4 py3.13
29642951
run_on:
29652952
- macos-14
29662953
batchtime: 20160
@@ -2969,11 +2956,11 @@ buildvariants:
29692956
AUTH: noauth
29702957
SSL: ssl
29712958
TOPOLOGY: server
2972-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2973-
- name: ocsp-test-macos-v8.0-py3.9
2959+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
2960+
- name: ocsp-test-macos-v8.0-py3.13
29742961
tasks:
29752962
- name: .ocsp-rsa !.ocsp-staple
2976-
display_name: OCSP test macOS v8.0 py3.9
2963+
display_name: OCSP test macOS v8.0 py3.13
29772964
run_on:
29782965
- macos-14
29792966
batchtime: 20160
@@ -2982,7 +2969,7 @@ buildvariants:
29822969
AUTH: noauth
29832970
SSL: ssl
29842971
TOPOLOGY: server
2985-
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
2972+
PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
29862973

29872974
- matrix_name: "oidc-auth-test"
29882975
matrix_spec:

‎.evergreen/scripts/generate_config.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ def get_python_binary(python, host):
8585

8686
# OCSP tests on rhel8 with rotating CPython versions.
8787
for version in ALL_VERSIONS:
88+
# OCSP is not supported until v4.4.
89+
if version == "4.0":
90+
continue
8891
task_refs = [EvgTaskRef(name=".ocsp")]
8992
expansions = dict(VERSION=version, AUTH="noauth", SSL="ssl", TOPOLOGY="server")
9093
batchtime = BATCHTIME_WEEK * 2
@@ -104,13 +107,16 @@ def get_python_binary(python, host):
104107
)
105108
variants.append(variant)
106109

107-
# OCSP tests on Windows and MacOS with lowest CPython version.
110+
# OCSP tests on Windows and MacOS.
108111
for host, version in product(["Win64", "macOS"], ["4.4", "8.0"]):
109112
# MongoDB servers do not staple OCSP responses and only support RSA.
110113
task_names = [".ocsp-rsa !.ocsp-staple"]
111114
expansions = dict(VERSION=version, AUTH="noauth", SSL="ssl", TOPOLOGY="server")
112115
batchtime = BATCHTIME_WEEK * 2
113-
python = CPYTHONS[0]
116+
if version == 4.4:
117+
python = CPYTHONS[0]
118+
else:
119+
python = CPYTHONS[-1]
114120
display_name = f"OCSP test {host} v{version} {python}"
115121
variant = create_variant(
116122
task_names,

0 commit comments

Comments
 (0)