@@ -1895,6 +1895,17 @@ axes:
18951895 GO_DIST : " /opt/golang/go1.16"
18961896 PYTHON3_BINARY : python3
18971897
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+
18981909 - id : os-aws-auth
18991910 display_name : OS
19001911 values :
@@ -2023,25 +2034,24 @@ buildvariants:
20232034 tasks :
20242035 - name : " aws-auth-test"
20252036
2026- # GODRIVER-1961 Upgrade OCSP tests to use os-ssl-40 and Ubuntu 18.04.
20272037 - 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 }"
20302040 batchtime : 20160 # 14 days
20312041 tasks :
20322042 - name : " .ocsp"
20332043
20342044 - 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 }"
20372047 batchtime : 20160 # 14 days
20382048 tasks :
20392049 # Windows MongoDB servers do not staple OCSP responses and only support RSA.
20402050 - name : " .ocsp-rsa !.ocsp-staple"
20412051
20422052 - 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 }"
20452055 batchtime : 20160 # 14 days
20462056 tasks :
20472057 # macos MongoDB servers do not staple OCSP responses and only support RSA.
0 commit comments