@@ -1895,6 +1895,17 @@ axes:
1895
1895
GO_DIST : " /opt/golang/go1.16"
1896
1896
PYTHON3_BINARY : python3
1897
1897
1898
+ # OCSP linux tasks need to run against this OS since stapling is disabled on Ubuntu 18.04 (SERVER-51364)
1899
+ - id : ocsp-rhel-70
1900
+ display_name : OS
1901
+ values :
1902
+ - id : " rhel70-go-1-16"
1903
+ display_name : " RHEL 7.0"
1904
+ run_on : rhel70-build
1905
+ variables :
1906
+ GO_DIST : " /opt/golang/go1.16"
1907
+ PYTHON3_BINARY : " /opt/python/3.6/bin/python3"
1908
+
1898
1909
- id : os-aws-auth
1899
1910
display_name : OS
1900
1911
values :
@@ -2023,25 +2034,24 @@ buildvariants:
2023
2034
tasks :
2024
2035
- name : " aws-auth-test"
2025
2036
2026
- # GODRIVER-1961 Upgrade OCSP tests to use os-ssl-40 and Ubuntu 18.04.
2027
2037
- matrix_name : " ocsp-test"
2028
- matrix_spec : { version: ["4.4", "latest"], os-ssl-32 : ["ubuntu1604-64 -go-1-16"] }
2029
- display_name : " OCSP ${version} ${os-ssl-32 }"
2038
+ matrix_spec : { version: ["4.4", "latest"], ocsp-rhel-70 : ["rhel70 -go-1-16"] }
2039
+ display_name : " OCSP ${version} ${ocsp-rhel-70 }"
2030
2040
batchtime : 20160 # 14 days
2031
2041
tasks :
2032
2042
- name : " .ocsp"
2033
2043
2034
2044
- matrix_name : " ocsp-test-windows"
2035
- matrix_spec : { version: ["4.4", "latest"], os-ssl-32 : ["windows-64-go-1-16"] }
2036
- display_name : " OCSP ${version} ${os-ssl-32 }"
2045
+ matrix_spec : { version: ["4.4", "latest"], os-ssl-40 : ["windows-64-go-1-16"] }
2046
+ display_name : " OCSP ${version} ${os-ssl-40 }"
2037
2047
batchtime : 20160 # 14 days
2038
2048
tasks :
2039
2049
# Windows MongoDB servers do not staple OCSP responses and only support RSA.
2040
2050
- name : " .ocsp-rsa !.ocsp-staple"
2041
2051
2042
2052
- matrix_name : " ocsp-test-macos"
2043
- matrix_spec : { version: ["4.4", "latest"], os-ssl-32 : ["osx-go-1-16"] }
2044
- display_name : " OCSP ${version} ${os-ssl-32 }"
2053
+ matrix_spec : { version: ["4.4", "latest"], os-ssl-40 : ["osx-go-1-16"] }
2054
+ display_name : " OCSP ${version} ${os-ssl-40 }"
2045
2055
batchtime : 20160 # 14 days
2046
2056
tasks :
2047
2057
# macos MongoDB servers do not staple OCSP responses and only support RSA.
0 commit comments