fix server startup

Author: blink1073

.evergreen/config.yml

@@ -207,7 +207,7 @@ functions:
         binary: bash
         working_dir: "src"
         include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION,
-          STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER]
+          STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER, LOCAL_ATLAS]
         args: [.evergreen/just.sh, run-server, "${TEST_NAME}"]
     - command: expansions.update
       params:

.evergreen/scripts/run_server.py

@@ -28,16 +28,6 @@ def start_server():
     elif test_name == "load_balancer":
         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:
-                if opt.startswith("--orchestration-file"):
-                    found = True
-            if not found:
-                raise ValueError("Please provide an orchestration file")
-
     elif test_name == "search_index":
         os.environ["TOPOLOGY"] = "replica_set"
         os.environ["MONGODB_VERSION"] = "7.0"

.evergreen/scripts/setup_tests.py

@@ -322,6 +322,15 @@ def handle_test_env() -> None:
             env["OCSP_ALGORITHM"] = ocsp_algo
             run_command(f"bash {DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh", env=env)
 
+        # The mock OCSP responder MUST BE started before the mongod as the mongod expects that
+        # a responder will be available upon startup.
+        cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/run-orchestration.sh", "--ssl"]
+        if opts.verbose:
+            cmd.append("-v")
+        elif opts.quiet:
+            cmd.append("-q")
+        run_command(cmd, cwd=DRIVERS_TOOLS)
+
     if SSL != "nossl":
         if not DRIVERS_TOOLS:
             raise RuntimeError("Missing DRIVERS_TOOLS")

.evergreen/scripts/utils.py

@@ -54,8 +54,8 @@ class Distro:
 
 EXTRA_TESTS = ["mod_wsgi", "aws_lambda"]
 
-# Tests that do not use run-orchestration.
-NO_RUN_ORCHESTRATION = ["auth_oidc", "atlas_connect", "data_lake", "mockupdb", "serverless"]
+# Tests that do not use run-orchestration directly.
+NO_RUN_ORCHESTRATION = ["auth_oidc", "atlas_connect", "data_lake", "mockupdb", "serverless", "ocsp"]
 
 
 def get_test_options(

CONTRIBUTING.md

@@ -335,7 +335,9 @@ You must have `docker` or `podman` installed locally.
 - Export the orchestration file, e.g. `export ORCHESTRATION_FILE=rsa-basic-tls-ocsp-disableStapling.json`.
 This corresponds to a config file in `$DRIVERS_TOOLS/.evergreen/orchestration/configs/servers`.
 MongoDB servers on MacOS and Windows do not staple OCSP responses and only support RSA.
-- Run `just run-server ocsp`.
+NOTE: because the mock ocsp responder MUST be started prior to the server starting, the ocsp tests start the server
+as part of `setup-tests`.
+
 - Run `just setup-tests ocsp <sub test>` (options are "valid", "revoked", "valid-delegate", "revoked-delegate").
 - Run `just run-tests`