cleanup

Author: blink1073

.evergreen/scripts/configure-env.sh

@@ -78,6 +78,8 @@ EOT
 rm -rf $DRIVERS_TOOLS
 BRANCH=master
 ORG=mongodb-labs
+BRANCH=ocsp-updates
+ORG=blink1073
 git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env

.evergreen/scripts/run_server.py

@@ -33,7 +33,6 @@ def start_server():
         set_env("LOAD_BALANCER")
 
     elif test_name == "ocsp":
-        opts.ssl = True
         if "ORCHESTRATION_FILE" not in os.environ:
             found = False
             for opt in extra_opts:
@@ -47,11 +46,10 @@ def start_server():
 
     if opts.ssl:
         extra_opts.append("--ssl")
-        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")
+        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

@@ -318,10 +318,6 @@ def handle_test_env() -> None:
 
         setup_kms(sub_test_name)
 
-    if test_name == "ocsp":
-        write_env("CA_FILE", os.environ["CA_FILE"])
-        write_env("OCSP_TLS_SHOULD_SUCCEED", os.environ["OCSP_TLS_SHOULD_SUCCEED"])
-
     if test_name == "auth_aws" and sub_test_name != "ecs-remote":
         auth_aws_dir = f"{DRIVERS_TOOLS}/.evergreen/auth_aws"
         if "AWS_ROLE_SESSION_NAME" in os.environ:

CONTRIBUTING.md

@@ -257,9 +257,9 @@ For KMS tests that run remotely and are expected to pass, in this case using `gc
 
 ### OCSP tests
 
-  - Export the algorithm, e.g. `export ORCHESTRATION_FILE=rsa-basic-tls-ocsp-mustStaple.json`.
+  - Export the algorithm, e.g. `export ORCHESTRATION_FILE=rsa-basic-tls-ocsp-disableStapling.json`.
     This corresponds to a config file in `$DRIVERS_TOOLS/.evergreen/orchestration/configs/servers`.
-    Only the rsa algorithm works on MacOS.
+    MongoDB servers on MacOS and Windows do not staple OCSP responses and only support RSA.
   - Run `just run-server ocsp`.
   - Run `just setup-tests ocsp valid` (options are "valid", "revoked", "valid-delegate", "revoked-delegate").
   - Run `just run-tests`