From ce57245d63ccfa01fcfdf7acd19d910eec6eb436 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 2 Feb 2026 20:50:56 -0600
Subject: [PATCH] test-mongodb-runner-python

---
 .evergreen/scripts/configure-env.sh | 2 ++
 .evergreen/scripts/run_server.py    | 4 ++--
 .evergreen/scripts/setup_tests.py   | 3 ++-
 .evergreen/scripts/stop-server.sh   | 4 ++--
 .evergreen/scripts/utils.py         | 2 +-
 CONTRIBUTING.md                     | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index 8dc328aab3..75a2abc4d7 100755
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -76,6 +76,8 @@ EOT
 rm -rf $DRIVERS_TOOLS
 BRANCH=master
 ORG=mongodb-labs
+ORG=blink1073
+BRANCH=test-mongodb-runner-python
 git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env
diff --git a/.evergreen/scripts/run_server.py b/.evergreen/scripts/run_server.py
index a35fbb57a8..9757eb3a4f 100644
--- a/.evergreen/scripts/run_server.py
+++ b/.evergreen/scripts/run_server.py
@@ -12,7 +12,7 @@ def set_env(name: str, value: Any = "1") -> None:
 
 def start_server():
     opts, extra_opts = get_test_options(
-        "Run a MongoDB server.  All given flags will be passed to run-orchestration.sh in DRIVERS_TOOLS.",
+        "Run a MongoDB server.  All given flags will be passed to run-mongodb.sh in DRIVERS_TOOLS.",
         require_sub_test_name=False,
         allow_extra_opts=True,
     )
@@ -51,7 +51,7 @@ def start_server():
     elif opts.quiet:
         extra_opts.append("-q")
 
-    cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/run-orchestration.sh", *extra_opts]
+    cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/run-mongodb.sh", "start", *extra_opts]
     run_command(cmd, cwd=DRIVERS_TOOLS)
 
 
diff --git a/.evergreen/scripts/setup_tests.py b/.evergreen/scripts/setup_tests.py
index 939423ffcc..18db68edcb 100644
--- a/.evergreen/scripts/setup_tests.py
+++ b/.evergreen/scripts/setup_tests.py
@@ -324,7 +324,8 @@ def handle_test_env() -> None:
         version = os.environ.get("VERSION", "latest")
         cmd = [
             "bash",
-            f"{DRIVERS_TOOLS}/.evergreen/run-orchestration.sh",
+            f"{DRIVERS_TOOLS}/.evergreen/run-mongodb.sh",
+            "start",
             "--ssl",
             "--version",
             version,
diff --git a/.evergreen/scripts/stop-server.sh b/.evergreen/scripts/stop-server.sh
index 7599387f5f..045a655cbd 100755
--- a/.evergreen/scripts/stop-server.sh
+++ b/.evergreen/scripts/stop-server.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Stop a server that was started using run-orchestration.sh in DRIVERS_TOOLS.
+# Stop a server that was started using run-mongodb.sh in DRIVERS_TOOLS.
 set -eu
 
 HERE=$(dirname ${BASH_SOURCE:-$0})
@@ -11,4 +11,4 @@ if [ -f $HERE/env.sh ]; then
   source $HERE/env.sh
 fi
 
-bash ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
+bash ${DRIVERS_TOOLS}/.evergreen/run-mongodb.sh stop
diff --git a/.evergreen/scripts/utils.py b/.evergreen/scripts/utils.py
index 2bc9c720d2..b35d732416 100644
--- a/.evergreen/scripts/utils.py
+++ b/.evergreen/scripts/utils.py
@@ -51,7 +51,7 @@ class Distro:
 
 EXTRA_TESTS = ["mod_wsgi", "aws_lambda", "doctest"]
 
-# Tests that do not use run-orchestration directly.
+# Tests that do not use run-mongodb directly.
 NO_RUN_ORCHESTRATION = [
     "auth_oidc",
     "atlas_connect",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eaf05111de..e24a4469f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -197,7 +197,7 @@ the pages will re-render and the browser will automatically refresh.
     version of Python, set `UV_PYTHON` before running `just install`.
 -   Ensure you have started the appropriate Mongo Server(s).  You can run `just run-server` with optional args
     to set up the server.  All given options will be passed to
-    [`run-orchestration.sh`](https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/run-orchestration.sh).  Run `$DRIVERS_TOOLS/evergreen/run-orchestration.sh -h`
+    [`run-mongodb.sh`](https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/run-mongodb.sh).  Run `$DRIVERS_TOOLS/evergreen/run-mongodb.sh start -h`
     for a full list of options.
 -   Run `just test` or `pytest` to run all of the tests.
 -   Append `test/<mod_name>.py::<class_name>::<test_name>` to run
@@ -396,7 +396,7 @@ To run any of the test suites with minimum supported dependencies, pass `--test-
 
 - If adding new tests files that should only be run for that test suite, add a pytest marker to the file and add
   to the list of pytest markers in `pyproject.toml`.  Then add the test suite to the `TEST_SUITE_MAP` in `.evergreen/scripts/utils.py`.  If for some reason it is not a pytest-runnable test, add it to the list of `EXTRA_TESTS` instead.
-- If the test uses Atlas or otherwise doesn't use `run-orchestration.sh`, add it to the `NO_RUN_ORCHESTRATION` list in
+- If the test uses Atlas or otherwise doesn't use `run-mongodb.sh`, add it to the `NO_RUN_ORCHESTRATION` list in
   `.evergreen/scripts/utils.py`.
 - If there is something special required to run the local server or there is an extra flag that should always be set
   like `AUTH`, add that logic to `.evergreen/scripts/run_server.py`.