Skip to content

Commit b56605c

Browse files
authored
PYTHON-5147 Do not run OCSP on MongoDB 4.2 (#2153)
1 parent 691ab8e commit b56605c

File tree

2 files changed

+22
-35
lines changed

2 files changed

+22
-35
lines changed

.evergreen/generated_configs/variants.yml

+21-34
Original file line numberDiff line numberDiff line change
@@ -817,23 +817,10 @@ buildvariants:
817817
PYTHON_BINARY: /opt/python/3.13/bin/python3
818818

819819
# Ocsp tests
820-
- name: ocsp-rhel8-v4.2-python3.9
820+
- name: ocsp-rhel8-v4.4-python3.9
821821
tasks:
822822
- name: .ocsp
823-
display_name: OCSP RHEL8 v4.2 Python3.9
824-
run_on:
825-
- rhel87-small
826-
batchtime: 20160
827-
expansions:
828-
AUTH: noauth
829-
SSL: ssl
830-
TOPOLOGY: server
831-
VERSION: "4.2"
832-
PYTHON_BINARY: /opt/python/3.9/bin/python3
833-
- name: ocsp-rhel8-v4.4-python3.10
834-
tasks:
835-
- name: .ocsp
836-
display_name: OCSP RHEL8 v4.4 Python3.10
823+
display_name: OCSP RHEL8 v4.4 Python3.9
837824
run_on:
838825
- rhel87-small
839826
batchtime: 20160
@@ -842,11 +829,11 @@ buildvariants:
842829
SSL: ssl
843830
TOPOLOGY: server
844831
VERSION: "4.4"
845-
PYTHON_BINARY: /opt/python/3.10/bin/python3
846-
- name: ocsp-rhel8-v5.0-python3.11
832+
PYTHON_BINARY: /opt/python/3.9/bin/python3
833+
- name: ocsp-rhel8-v5.0-python3.10
847834
tasks:
848835
- name: .ocsp
849-
display_name: OCSP RHEL8 v5.0 Python3.11
836+
display_name: OCSP RHEL8 v5.0 Python3.10
850837
run_on:
851838
- rhel87-small
852839
batchtime: 20160
@@ -855,11 +842,11 @@ buildvariants:
855842
SSL: ssl
856843
TOPOLOGY: server
857844
VERSION: "5.0"
858-
PYTHON_BINARY: /opt/python/3.11/bin/python3
859-
- name: ocsp-rhel8-v6.0-python3.12
845+
PYTHON_BINARY: /opt/python/3.10/bin/python3
846+
- name: ocsp-rhel8-v6.0-python3.11
860847
tasks:
861848
- name: .ocsp
862-
display_name: OCSP RHEL8 v6.0 Python3.12
849+
display_name: OCSP RHEL8 v6.0 Python3.11
863850
run_on:
864851
- rhel87-small
865852
batchtime: 20160
@@ -868,11 +855,11 @@ buildvariants:
868855
SSL: ssl
869856
TOPOLOGY: server
870857
VERSION: "6.0"
871-
PYTHON_BINARY: /opt/python/3.12/bin/python3
872-
- name: ocsp-rhel8-v7.0-python3.13
858+
PYTHON_BINARY: /opt/python/3.11/bin/python3
859+
- name: ocsp-rhel8-v7.0-python3.12
873860
tasks:
874861
- name: .ocsp
875-
display_name: OCSP RHEL8 v7.0 Python3.13
862+
display_name: OCSP RHEL8 v7.0 Python3.12
876863
run_on:
877864
- rhel87-small
878865
batchtime: 20160
@@ -881,11 +868,11 @@ buildvariants:
881868
SSL: ssl
882869
TOPOLOGY: server
883870
VERSION: "7.0"
884-
PYTHON_BINARY: /opt/python/3.13/bin/python3
885-
- name: ocsp-rhel8-v8.0-pypy3.10
871+
PYTHON_BINARY: /opt/python/3.12/bin/python3
872+
- name: ocsp-rhel8-v8.0-python3.13
886873
tasks:
887874
- name: .ocsp
888-
display_name: OCSP RHEL8 v8.0 PyPy3.10
875+
display_name: OCSP RHEL8 v8.0 Python3.13
889876
run_on:
890877
- rhel87-small
891878
batchtime: 20160
@@ -894,11 +881,11 @@ buildvariants:
894881
SSL: ssl
895882
TOPOLOGY: server
896883
VERSION: "8.0"
897-
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
898-
- name: ocsp-rhel8-rapid-python3.9
884+
PYTHON_BINARY: /opt/python/3.13/bin/python3
885+
- name: ocsp-rhel8-rapid-pypy3.10
899886
tasks:
900887
- name: .ocsp
901-
display_name: OCSP RHEL8 rapid Python3.9
888+
display_name: OCSP RHEL8 rapid PyPy3.10
902889
run_on:
903890
- rhel87-small
904891
batchtime: 20160
@@ -907,11 +894,11 @@ buildvariants:
907894
SSL: ssl
908895
TOPOLOGY: server
909896
VERSION: rapid
910-
PYTHON_BINARY: /opt/python/3.9/bin/python3
911-
- name: ocsp-rhel8-latest-python3.10
897+
PYTHON_BINARY: /opt/python/pypy3.10/bin/python3
898+
- name: ocsp-rhel8-latest-python3.9
912899
tasks:
913900
- name: .ocsp
914-
display_name: OCSP RHEL8 latest Python3.10
901+
display_name: OCSP RHEL8 latest Python3.9
915902
run_on:
916903
- rhel87-small
917904
batchtime: 20160
@@ -920,7 +907,7 @@ buildvariants:
920907
SSL: ssl
921908
TOPOLOGY: server
922909
VERSION: latest
923-
PYTHON_BINARY: /opt/python/3.10/bin/python3
910+
PYTHON_BINARY: /opt/python/3.9/bin/python3
924911
- name: ocsp-win64-v4.4-python3.9
925912
tasks:
926913
- name: .ocsp-rsa !.ocsp-staple

.evergreen/scripts/generate_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def create_ocsp_variants() -> list[BuildVariant]:
239239
base_display = "OCSP"
240240

241241
# OCSP tests on default host with all servers v4.4+ and all python versions.
242-
versions = [v for v in ALL_VERSIONS if v != "4.0"]
242+
versions = get_versions_from("4.4")
243243
for version, python in zip_cycle(versions, ALL_PYTHONS):
244244
host = DEFAULT_HOST
245245
variant = create_variant(

0 commit comments

Comments
 (0)