fix handling of tls

Author: blink1073

.evergreen/scripts/run_server.py

@@ -47,10 +47,11 @@ def start_server():
 
     if opts.ssl:
         extra_opts.append("--ssl")
-        certs = ROOT / "test/certificates"
-        set_env("TLS_CERT_KEY_FILE", certs / "client.pem")
-        set_env("TLS_PEM_KEY_FILE", certs / "server.pem")
-        set_env("TLS_CA_FILE", certs / "ca.pem")
+        if test_name != "ocsp":
+            certs = ROOT / "test/certificates"
+            set_env("TLS_CERT_KEY_FILE", certs / "client.pem")
+            set_env("TLS_PEM_KEY_FILE", certs / "server.pem")
+            set_env("TLS_CA_FILE", certs / "ca.pem")
 
     cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/run-orchestration.sh", *extra_opts]
     run_command(cmd, cwd=DRIVERS_TOOLS)

.evergreen/scripts/setup_tests.py

@@ -249,11 +249,11 @@ def handle_test_env() -> None:
         server_type = os.environ["OCSP_SERVER_TYPE"]
         ocsp_algo = os.environ["ORCHESTRATION_FILE"].split("-")[0]
         if server_type == "no-reponder":
-            should_succeed = "mustStaple" not in ocsp_algo
+            tls_should_succeed = False
         else:
-            should_succeed = "true" if "valid" in server_type else "false"
+            tls_should_succeed = "true" if "valid" in server_type else "false"
 
-        write_env("OCSP_TLS_SHOULD_SUCCEED", should_succeed)
+        write_env("OCSP_TLS_SHOULD_SUCCEED", tls_should_succeed)
         write_env("CA_FILE", f"{DRIVERS_TOOLS}/.evergreen/ocsp/{ocsp_algo}/ca.pem")
 
         if server_type != "no-responder":