From ea2465dfaa3ade0a43744d9c656740f9d929ff1b Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 22 Oct 2025 15:37:27 +0200
Subject: [PATCH 01/10] Bump drivers-evergreen-tools

---
 .mod/drivers-evergreen-tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools
index 14cc285a38..0723fe0bea 160000
--- a/.mod/drivers-evergreen-tools
+++ b/.mod/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit 14cc285a383f79eb2d0aec95e611192da9aa9dad
+Subproject commit 0723fe0bea104a35af094b08f4e21509979567a3

From 1d0bf102dc791f25fb809d14d0b4c7c9261ed88e Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 22 Oct 2025 15:46:20 +0200
Subject: [PATCH 02/10] Use orchestration

---
 .evergreen/config.yml              | 139 ++++++++++++++---------------
 .evergreen/config/axes.yml.erb     |  49 +++-------
 .evergreen/config/commands.yml.erb |  26 +++++-
 .evergreen/config/variants.yml.erb |  64 ++++++-------
 4 files changed, 138 insertions(+), 140 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 8549b6516b..294ee84718 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -99,6 +99,27 @@ functions:
       params:
         file: src/expansion.yml
 
+  bootstrap-mongo-orchestration:
+      - command: shell.exec
+        params:
+          shell: "bash"
+          script: |
+            set -x
+            ${PREPARE_SHELL}
+
+            MONGODB_VERSION=${MONGODB_VERSION} \
+            TOPOLOGY=${TOPOLOGY} \
+            AUTH=${AUTH} \
+            SSL=${SSL} \
+            ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
+            REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+            LOAD_BALANCER=${LOAD_BALANCER} \
+            REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
+            sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+      - command: expansions.update
+        params:
+          file: mo-expansion.yml
+
   "exec script" :
     - command: shell.exec
       type: test
@@ -277,7 +298,9 @@ functions:
             DRIVER="${DRIVER}" \
             TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
             FLE="${FLE}" \
-            .evergreen/run-tests-docker.sh
+            AUTH="${AUTH}" \
+            SSL="${SSL}" \
+            .evergreen/run-tests.sh
 
   "fix absolute paths":
     - command: shell.exec
@@ -359,6 +382,7 @@ task_groups:
 tasks:
     - name: "test"
       commands:
+        - func: bootstrap-mongo-orchestration
         - func: "run tests"
     - name: "test-full-atlas-task"
       commands:
@@ -379,6 +403,10 @@ axes:
         display_name: "MongoDB Latest"
         variables:
            VERSION: "latest"
+      - id: "8.0"
+        display_name: "MongoDB 8.0"
+        variables:
+           VERSION: "8.0"
       - id: "7.0"
         display_name: "MongoDB 7.0"
         variables:
@@ -415,22 +443,18 @@ axes:
   - id: "topology"
     display_name: Topology
     values:
-      - id: "standalone"
+      - id: "server"
         display_name: Standalone
         variables:
-           TOPOLOGY: "standalone"
-      - id: "replica-set"
+           TOPOLOGY: "server"
+      - id: "replica_set"
         display_name: Replica Set
         variables:
-           TOPOLOGY: "replica-set"
-      - id: "sharded-cluster"
+           TOPOLOGY: "replica_set"
+      - id: "sharded_cluster"
         display_name: Sharded Cluster
         variables:
-           TOPOLOGY: "sharded-cluster"
-      - id: "load-balanced"
-        display_name: Load Balanced
-        variables:
-           TOPOLOGY: "load-balanced"
+           TOPOLOGY: "sharded_cluster"
 
   - id: "auth"
     display_name: Authentication
@@ -447,7 +471,7 @@ axes:
   - id: "ssl"
     display_name: SSL
     values:
-      - id: "ssl"
+      - id: "yes"
         display_name: SSL
         variables:
            SSL: "ssl"
@@ -495,34 +519,9 @@ axes:
   - id: "os"
     display_name: OS
     values:
-      - id: actual-ubuntu-22.04
-        display_name: "Ubuntu 22.04"
-        run_on: ubuntu2204-small
       - id: ubuntu-22.04
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2204-small
-        variables:
-          DOCKER_DISTRO: ubuntu2204
-      - id: ubuntu-20.04
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: ubuntu2004
-      - id: ubuntu-18.04
         display_name: "Ubuntu 22.04"
-        run_on: ubuntu1804-small
-        variables:
-          DOCKER_DISTRO: ubuntu1804
-      - id: debian11
-        display_name: "Debian 11"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: debian11
-      - id: rhel80
-        display_name: "RHEL 8.0"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: rhel80
+        run_on: ubuntu2204-small
 
   - id: "driver"
     display_name: Driver Version
@@ -647,7 +646,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -658,7 +657,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -669,7 +668,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -680,9 +679,9 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.0"]
     driver: ["current"]
-    topology: ['replica-set']
+    topology: ['replica_set']
     mongodb-version: ['5.0']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -691,7 +690,7 @@ buildvariants:
   matrix_spec:
     jruby: ["jruby-9.4"]
     driver: ["current"]
-    topology: ['replica-set', 'sharded-cluster']
+    topology: ['replica_set', 'sharded_cluster']
     mongodb-version: '7.0'
     os: ubuntu-22.04
   display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -702,9 +701,9 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['4.4']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -714,7 +713,7 @@ buildvariants:
     driver: [master, stable]
     ruby: ["ruby-3.3"]
     mongodb-version: "6.0"
-    topology: ['replica-set', 'sharded-cluster']
+    topology: ['replica_set', 'sharded_cluster']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -725,8 +724,8 @@ buildvariants:
     driver: [oldstable, min]
     ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
-    topology: ['replica-set', 'sharded-cluster']
-    os: ubuntu-20.04
+    topology: ['replica_set', 'sharded_cluster']
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -736,8 +735,8 @@ buildvariants:
     driver: [min]
     ruby: ["ruby-2.7"]
     mongodb-version: "4.4"
-    topology: "standalone"
-    os: ubuntu-20.04
+    topology: "server"
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -747,8 +746,8 @@ buildvariants:
     driver: [bson-min]
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
-    topology: "standalone"
-    os: ubuntu-20.04
+    topology: "server"
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -758,7 +757,7 @@ buildvariants:
     driver: [bson-master]
     ruby: ["ruby-3.3"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -769,7 +768,7 @@ buildvariants:
     ruby: ["ruby-3.2"]
     driver: ["current"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['master']
     os: ubuntu-22.04
     fle: helper
@@ -782,7 +781,7 @@ buildvariants:
     ruby: ["ruby-3.3"]
     driver: ["current"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['8.0']
     os: ubuntu-22.04
     fle: helper
@@ -795,7 +794,7 @@ buildvariants:
     ruby: ["ruby-3.3"]
     driver: ["current"]
     mongodb-version: "6.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['7.0', '7.1', '7.2']
     os: ubuntu-22.04
     fle: helper
@@ -808,9 +807,9 @@ buildvariants:
     ruby: ["ruby-3.0"]
     driver: ["current"]
     mongodb-version: "6.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['6.0', '6.1']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
@@ -820,9 +819,9 @@ buildvariants:
     ruby: "ruby-3.0"
     driver: ["current"]
     mongodb-version: "4.4"
-    topology: "standalone"
+    topology: "server"
     test-i18n-fallbacks: yes
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
@@ -832,7 +831,7 @@ buildvariants:
     ruby: ["ruby-3.2", "ruby-3.3"]
     driver: ["current"]
     mongodb-version: '7.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['8.0']
     os: ubuntu-22.04
@@ -845,7 +844,7 @@ buildvariants:
     ruby: ["ruby-3.2", "ruby-3.3"]
     driver: ["current"]
     mongodb-version: '7.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['7.0', '7.1', '7.2']
     os: ubuntu-22.04
@@ -858,10 +857,10 @@ buildvariants:
     ruby: ["ruby-2.7"]
     driver: ["current"]
     mongodb-version: '5.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['6.0', '6.1']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
@@ -872,10 +871,10 @@ buildvariants:
 #    jruby: ["jruby-9.4"]
 #    driver: ["current"]
 #    mongodb-version: '5.0'
-#    topology: standalone
+#    topology: server
 #    app-tests: yes
 #    rails: ['7.1']
-#    os: ubuntu-20.04
+#    os: ubuntu-22.04
 #  display_name: "app tests ${driver}, ${jruby}"
 #  tasks:
 #     - name: "test"
@@ -884,7 +883,7 @@ buildvariants:
   matrix_spec:
     ruby: ruby-3.1
     driver: current
-    topology: replica-set
+    topology: replica_set
     mongodb-version: ['6.0']
     os: ubuntu-22.04
     rails: ['7.0']
@@ -896,9 +895,9 @@ buildvariants:
 - matrix_name: atlas-full
   matrix_spec:
     ruby: ruby-3.2
-    os: actual-ubuntu-22.04
+    os: ubuntu-22.04
     auth: auth
-    ssl: ssl
+    ssl: yes
   display_name: "Atlas (Full)"
   tasks:
     - name: testatlas_task_group
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index dad5230c7b..57720d0d7d 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -6,6 +6,10 @@ axes:
         display_name: "MongoDB Latest"
         variables:
            VERSION: "latest"
+      - id: "8.0"
+        display_name: "MongoDB 8.0"
+        variables:
+           VERSION: "8.0"
       - id: "7.0"
         display_name: "MongoDB 7.0"
         variables:
@@ -42,22 +46,18 @@ axes:
   - id: "topology"
     display_name: Topology
     values:
-      - id: "standalone"
+      - id: "server"
         display_name: Standalone
         variables:
-           TOPOLOGY: "standalone"
-      - id: "replica-set"
+           TOPOLOGY: "server"
+      - id: "replica_set"
         display_name: Replica Set
         variables:
-           TOPOLOGY: "replica-set"
-      - id: "sharded-cluster"
+           TOPOLOGY: "replica_set"
+      - id: "sharded_cluster"
         display_name: Sharded Cluster
         variables:
-           TOPOLOGY: "sharded-cluster"
-      - id: "load-balanced"
-        display_name: Load Balanced
-        variables:
-           TOPOLOGY: "load-balanced"
+           TOPOLOGY: "sharded_cluster"
 
   - id: "auth"
     display_name: Authentication
@@ -74,7 +74,7 @@ axes:
   - id: "ssl"
     display_name: SSL
     values:
-      - id: "ssl"
+      - id: "yes"
         display_name: SSL
         variables:
            SSL: "ssl"
@@ -122,34 +122,9 @@ axes:
   - id: "os"
     display_name: OS
     values:
-      - id: actual-ubuntu-22.04
-        display_name: "Ubuntu 22.04"
-        run_on: ubuntu2204-small
       - id: ubuntu-22.04
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2204-small
-        variables:
-          DOCKER_DISTRO: ubuntu2204
-      - id: ubuntu-20.04
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: ubuntu2004
-      - id: ubuntu-18.04
         display_name: "Ubuntu 22.04"
-        run_on: ubuntu1804-small
-        variables:
-          DOCKER_DISTRO: ubuntu1804
-      - id: debian11
-        display_name: "Debian 11"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: debian11
-      - id: rhel80
-        display_name: "RHEL 8.0"
-        run_on: ubuntu2004-small
-        variables:
-          DOCKER_DISTRO: rhel80
+        run_on: ubuntu2204-small
 
   - id: "driver"
     display_name: Driver Version
diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
index c7966e9791..daa40dce72 100644
--- a/.evergreen/config/commands.yml.erb
+++ b/.evergreen/config/commands.yml.erb
@@ -73,6 +73,27 @@ functions:
       params:
         file: src/expansion.yml
 
+  bootstrap-mongo-orchestration:
+      - command: shell.exec
+        params:
+          shell: "bash"
+          script: |
+            set -x
+            ${PREPARE_SHELL}
+
+            MONGODB_VERSION=${MONGODB_VERSION} \
+            TOPOLOGY=${TOPOLOGY} \
+            AUTH=${AUTH} \
+            SSL=${SSL} \
+            ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
+            REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+            LOAD_BALANCER=${LOAD_BALANCER} \
+            REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
+            sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+      - command: expansions.update
+        params:
+          file: mo-expansion.yml
+
   "exec script" :
     - command: shell.exec
       type: test
@@ -251,7 +272,9 @@ functions:
             DRIVER="${DRIVER}" \
             TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
             FLE="${FLE}" \
-            .evergreen/run-tests-docker.sh
+            AUTH="${AUTH}" \
+            SSL="${SSL}" \
+            .evergreen/run-tests.sh
 
   "fix absolute paths":
     - command: shell.exec
@@ -333,6 +356,7 @@ task_groups:
 tasks:
     - name: "test"
       commands:
+        - func: bootstrap-mongo-orchestration
         - func: "run tests"
     - name: "test-full-atlas-task"
       commands:
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index 3a34f77cf1..a39c603070 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -14,7 +14,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -25,7 +25,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -36,7 +36,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -47,9 +47,9 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.0"]
     driver: ["current"]
-    topology: ['replica-set']
+    topology: ['replica_set']
     mongodb-version: ['5.0']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -58,7 +58,7 @@ buildvariants:
   matrix_spec:
     jruby: ["jruby-9.4"]
     driver: ["current"]
-    topology: ['replica-set', 'sharded-cluster']
+    topology: ['replica_set', 'sharded_cluster']
     mongodb-version: '7.0'
     os: ubuntu-22.04
   display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -69,9 +69,9 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: ['standalone', 'replica-set', 'sharded-cluster']
+    topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['4.4']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -81,7 +81,7 @@ buildvariants:
     driver: [master, stable]
     ruby: ["ruby-3.3"]
     mongodb-version: "6.0"
-    topology: ['replica-set', 'sharded-cluster']
+    topology: ['replica_set', 'sharded_cluster']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -92,8 +92,8 @@ buildvariants:
     driver: [oldstable, min]
     ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
-    topology: ['replica-set', 'sharded-cluster']
-    os: ubuntu-20.04
+    topology: ['replica_set', 'sharded_cluster']
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -103,8 +103,8 @@ buildvariants:
     driver: [min]
     ruby: ["ruby-2.7"]
     mongodb-version: "4.4"
-    topology: "standalone"
-    os: ubuntu-20.04
+    topology: "server"
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -114,8 +114,8 @@ buildvariants:
     driver: [bson-min]
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
-    topology: "standalone"
-    os: ubuntu-20.04
+    topology: "server"
+    os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -125,7 +125,7 @@ buildvariants:
     driver: [bson-master]
     ruby: ["ruby-3.3"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
@@ -136,7 +136,7 @@ buildvariants:
     ruby: ["ruby-3.2"]
     driver: ["current"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['master']
     os: ubuntu-22.04
     fle: helper
@@ -149,7 +149,7 @@ buildvariants:
     ruby: ["ruby-3.3"]
     driver: ["current"]
     mongodb-version: "7.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['8.0']
     os: ubuntu-22.04
     fle: helper
@@ -162,7 +162,7 @@ buildvariants:
     ruby: ["ruby-3.3"]
     driver: ["current"]
     mongodb-version: "6.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['7.0', '7.1', '7.2']
     os: ubuntu-22.04
     fle: helper
@@ -175,9 +175,9 @@ buildvariants:
     ruby: ["ruby-3.0"]
     driver: ["current"]
     mongodb-version: "6.0"
-    topology: "standalone"
+    topology: "server"
     rails: ['6.0', '6.1']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
@@ -187,9 +187,9 @@ buildvariants:
     ruby: "ruby-3.0"
     driver: ["current"]
     mongodb-version: "4.4"
-    topology: "standalone"
+    topology: "server"
     test-i18n-fallbacks: yes
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
@@ -199,7 +199,7 @@ buildvariants:
     ruby: ["ruby-3.2", "ruby-3.3"]
     driver: ["current"]
     mongodb-version: '7.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['8.0']
     os: ubuntu-22.04
@@ -212,7 +212,7 @@ buildvariants:
     ruby: ["ruby-3.2", "ruby-3.3"]
     driver: ["current"]
     mongodb-version: '7.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['7.0', '7.1', '7.2']
     os: ubuntu-22.04
@@ -225,10 +225,10 @@ buildvariants:
     ruby: ["ruby-2.7"]
     driver: ["current"]
     mongodb-version: '5.0'
-    topology: standalone
+    topology: server
     app-tests: yes
     rails: ['6.0', '6.1']
-    os: ubuntu-20.04
+    os: ubuntu-22.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
@@ -239,10 +239,10 @@ buildvariants:
 #    jruby: ["jruby-9.4"]
 #    driver: ["current"]
 #    mongodb-version: '5.0'
-#    topology: standalone
+#    topology: server
 #    app-tests: yes
 #    rails: ['7.1']
-#    os: ubuntu-20.04
+#    os: ubuntu-22.04
 #  display_name: "app tests ${driver}, ${jruby}"
 #  tasks:
 #     - name: "test"
@@ -251,7 +251,7 @@ buildvariants:
   matrix_spec:
     ruby: ruby-3.1
     driver: current
-    topology: replica-set
+    topology: replica_set
     mongodb-version: ['6.0']
     os: ubuntu-22.04
     rails: ['7.0']
@@ -263,9 +263,9 @@ buildvariants:
 - matrix_name: atlas-full
   matrix_spec:
     ruby: ruby-3.2
-    os: actual-ubuntu-22.04
+    os: ubuntu-22.04
     auth: auth
-    ssl: ssl
+    ssl: yes
   display_name: "Atlas (Full)"
   tasks:
     - name: testatlas_task_group

From 7f017a4f707396eb0bac98a54bb8ba64377e50e9 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 22 Oct 2025 16:26:52 +0200
Subject: [PATCH 03/10] Install toolchain

---
 .evergreen/run-tests.sh | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 533e55b32c..4145ba22bc 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -19,8 +19,16 @@ arch=`host_distro`
 
 set_fcv
 set_env_vars
-set_env_python
-set_env_ruby
+
+# Install rbenv and download the requested ruby version
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
 
 if test -n "$APP_TESTS"; then
   set_env_node
@@ -28,23 +36,6 @@ fi
 
 prepare_server $arch
 
-install_mlaunch_venv
-
-if test "$TOPOLOGY" = load-balanced; then
-  install_haproxy
-fi
-
-# Launching mongod under $MONGO_ORCHESTRATION_HOME
-# makes its log available through log collecting machinery
-
-export dbdir="$MONGO_ORCHESTRATION_HOME"/db
-mkdir -p "$dbdir"
-
-calculate_server_args
-launch_server "$dbdir"
-
-uri_options="$URI_OPTIONS"
-
 which bundle
 bundle --version
 

From 6f7e5bdf8d2522c575fc9e9a913448b41f0425a8 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 09:46:14 +0200
Subject: [PATCH 04/10] Try without docker

---
 .evergreen/config.yml              | 21 +++++++++++++++------
 .evergreen/config/axes.yml.erb     |  3 +++
 .evergreen/config/commands.yml.erb | 10 ++++++++--
 .evergreen/config/variants.yml.erb |  8 ++++----
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 294ee84718..3806ab4aff 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -311,7 +311,13 @@ functions:
             perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename
           done
 
-  "install dependencies":
+  "setup system":
+    - command: subprocess.exec
+      params:
+        binary: bash
+        include_expansions_in_env: ["PROJECT_DIRECTORY"]
+        args:
+          - "${DRIVERS_TOOLS}/.evergreen/setup.sh"
     - command: shell.exec
       type: test
       params:
@@ -325,7 +331,7 @@ pre:
   - func: "fetch source"
   - func: "create expansions"
   - func: "fix absolute paths"
-  - func: "install dependencies"
+  - func: "setup system"
 
 post:
   # Removed, causing timeouts
@@ -522,6 +528,9 @@ axes:
       - id: ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
+      - id: ubuntu-20.04
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-small
 
   - id: "driver"
     display_name: Driver Version
@@ -703,7 +712,7 @@ buildvariants:
     driver: ["current"]
     topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['4.4']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -725,7 +734,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
     topology: ['replica_set', 'sharded_cluster']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -736,7 +745,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "4.4"
     topology: "server"
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -821,7 +830,7 @@ buildvariants:
     mongodb-version: "4.4"
     topology: "server"
     test-i18n-fallbacks: yes
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index 57720d0d7d..655cba2326 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -125,6 +125,9 @@ axes:
       - id: ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
+      - id: ubuntu-20.04
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-small
 
   - id: "driver"
     display_name: Driver Version
diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
index daa40dce72..aac9de3fc0 100644
--- a/.evergreen/config/commands.yml.erb
+++ b/.evergreen/config/commands.yml.erb
@@ -285,7 +285,13 @@ functions:
             perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename
           done
 
-  "install dependencies":
+  "setup system":
+    - command: subprocess.exec
+      params:
+        binary: bash
+        include_expansions_in_env: ["PROJECT_DIRECTORY"]
+        args:
+          - "${DRIVERS_TOOLS}/.evergreen/setup.sh"
     - command: shell.exec
       type: test
       params:
@@ -299,7 +305,7 @@ pre:
   - func: "fetch source"
   - func: "create expansions"
   - func: "fix absolute paths"
-  - func: "install dependencies"
+  - func: "setup system"
 
 post:
   # Removed, causing timeouts
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index a39c603070..96381da087 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -71,7 +71,7 @@ buildvariants:
     driver: ["current"]
     topology: ['server', 'replica_set', 'sharded_cluster']
     mongodb-version: ['4.4']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -93,7 +93,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
     topology: ['replica_set', 'sharded_cluster']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -104,7 +104,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "4.4"
     topology: "server"
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
      - name: "test"
@@ -189,7 +189,7 @@ buildvariants:
     mongodb-version: "4.4"
     topology: "server"
     test-i18n-fallbacks: yes
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"

From f5f92a390281cd86d63ae2b8f255905c4ca0f661 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 10:00:26 +0200
Subject: [PATCH 05/10] Properly use orchestration

---
 .evergreen/config.yml              | 26 +++++++++++++-------------
 .evergreen/config/axes.yml.erb     | 20 ++++++++++----------
 .evergreen/config/commands.yml.erb |  6 +++---
 .evergreen/run-tests.sh            |  2 --
 spec/shared                        |  2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 3806ab4aff..6dbef826e3 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -78,7 +78,7 @@ functions:
             export PATH="$MONGODB_BINARIES:$PATH"
             export PROJECT="${project}"
 
-            export MONGODB_VERSION="${VERSION}"
+            export MONGODB_VERSION="${MONGODB_VERSION}"
             export TOPOLOGY="${TOPOLOGY}"
             export SINGLE_MONGOS="${SINGLE_MONGOS}"
             export AUTH="${AUTH}"
@@ -280,7 +280,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/rspec.xml
+        file: ./src/tmp/*.xml
 
   "run tests":
     - command: shell.exec
@@ -337,7 +337,7 @@ post:
   # Removed, causing timeouts
   # - func: "upload working dir"
   - func: "upload mo artifacts"
-  # - func: "upload test results"
+  - func: "upload test results"
   - func: "upload test results to s3"
 
 task_groups:
@@ -408,43 +408,43 @@ axes:
       - id: "latest"
         display_name: "MongoDB Latest"
         variables:
-           VERSION: "latest"
+           MONGODB_VERSION: "latest"
       - id: "8.0"
         display_name: "MongoDB 8.0"
         variables:
-           VERSION: "8.0"
+           MONGODB_VERSION: "8.0"
       - id: "7.0"
         display_name: "MongoDB 7.0"
         variables:
-           VERSION: "7.0"
+           MONGODB_VERSION: "7.0"
       - id: "6.0"
         display_name: "MongoDB 6.0"
         variables:
-           VERSION: "6.0"
+           MONGODB_VERSION: "6.0"
       - id: "5.3"
         display_name: "MongoDB 5.3"
         variables:
-           VERSION: "5.3"
+           MONGODB_VERSION: "5.3"
       - id: "5.0"
         display_name: "MongoDB 5.0"
         variables:
-           VERSION: "5.0"
+           MONGODB_VERSION: "5.0"
       - id: "4.4"
         display_name: "MongoDB 4.4"
         variables:
-           VERSION: "4.4"
+           MONGODB_VERSION: "4.4"
       - id: "4.2"
         display_name: "MongoDB 4.2"
         variables:
-           VERSION: "4.2"
+           MONGODB_VERSION: "4.2"
       - id: "4.0"
         display_name: "MongoDB 4.0"
         variables:
-           VERSION: "4.0"
+           MONGODB_VERSION: "4.0"
       - id: "3.6"
         display_name: "MongoDB 3.6"
         variables:
-           VERSION: "3.6"
+           MONGODB_VERSION: "3.6"
 
   - id: "topology"
     display_name: Topology
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index 655cba2326..d80c33da13 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -5,43 +5,43 @@ axes:
       - id: "latest"
         display_name: "MongoDB Latest"
         variables:
-           VERSION: "latest"
+           MONGODB_VERSION: "latest"
       - id: "8.0"
         display_name: "MongoDB 8.0"
         variables:
-           VERSION: "8.0"
+           MONGODB_VERSION: "8.0"
       - id: "7.0"
         display_name: "MongoDB 7.0"
         variables:
-           VERSION: "7.0"
+           MONGODB_VERSION: "7.0"
       - id: "6.0"
         display_name: "MongoDB 6.0"
         variables:
-           VERSION: "6.0"
+           MONGODB_VERSION: "6.0"
       - id: "5.3"
         display_name: "MongoDB 5.3"
         variables:
-           VERSION: "5.3"
+           MONGODB_VERSION: "5.3"
       - id: "5.0"
         display_name: "MongoDB 5.0"
         variables:
-           VERSION: "5.0"
+           MONGODB_VERSION: "5.0"
       - id: "4.4"
         display_name: "MongoDB 4.4"
         variables:
-           VERSION: "4.4"
+           MONGODB_VERSION: "4.4"
       - id: "4.2"
         display_name: "MongoDB 4.2"
         variables:
-           VERSION: "4.2"
+           MONGODB_VERSION: "4.2"
       - id: "4.0"
         display_name: "MongoDB 4.0"
         variables:
-           VERSION: "4.0"
+           MONGODB_VERSION: "4.0"
       - id: "3.6"
         display_name: "MongoDB 3.6"
         variables:
-           VERSION: "3.6"
+           MONGODB_VERSION: "3.6"
 
   - id: "topology"
     display_name: Topology
diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
index aac9de3fc0..44176a71ec 100644
--- a/.evergreen/config/commands.yml.erb
+++ b/.evergreen/config/commands.yml.erb
@@ -52,7 +52,7 @@ functions:
             export PATH="$MONGODB_BINARIES:$PATH"
             export PROJECT="${project}"
 
-            export MONGODB_VERSION="${VERSION}"
+            export MONGODB_VERSION="${MONGODB_VERSION}"
             export TOPOLOGY="${TOPOLOGY}"
             export SINGLE_MONGOS="${SINGLE_MONGOS}"
             export AUTH="${AUTH}"
@@ -254,7 +254,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/rspec.xml
+        file: ./src/tmp/*.xml
 
   "run tests":
     - command: shell.exec
@@ -311,7 +311,7 @@ post:
   # Removed, causing timeouts
   # - func: "upload working dir"
   - func: "upload mo artifacts"
-  # - func: "upload test results"
+  - func: "upload test results"
   - func: "upload test results to s3"
 
 task_groups:
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 4145ba22bc..36ee777ffe 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -34,8 +34,6 @@ if test -n "$APP_TESTS"; then
   set_env_node
 fi
 
-prepare_server $arch
-
 which bundle
 bundle --version
 
diff --git a/spec/shared b/spec/shared
index 6b1158f69f..522fdda423 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 6b1158f69f7a23345259223bc305393b86e9ab3e
+Subproject commit 522fdda423705751d4c282ed476e959c9ce90826

From 0c3a476181376ca7711ca47b0033717f403e92d7 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 10:05:05 +0200
Subject: [PATCH 06/10] Add xunit output gem

---
 gemfiles/standard.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb
index 6622544a79..fab9ee0ffa 100644
--- a/gemfiles/standard.rb
+++ b/gemfiles/standard.rb
@@ -42,6 +42,7 @@ def standard_dependencies
     gem 'fuubar'
     gem 'rfc'
     gem 'childprocess'
+    gem 'rspec_junit_formatter'
 
     platform :mri do
       gem 'timeout-interrupt'

From 359e4f9ce82e0e25252a22780fe9906fdb5946ef Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 10:21:21 +0200
Subject: [PATCH 07/10] Remove 4.0

---
 .evergreen/config.yml              | 2 +-
 .evergreen/config/variants.yml.erb | 2 +-
 .evergreen/run-tests.sh            | 2 --
 spec/shared                        | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 6dbef826e3..656de16b38 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -732,7 +732,7 @@ buildvariants:
   matrix_spec:
     driver: [oldstable, min]
     ruby: ["ruby-2.7"]
-    mongodb-version: "4.0"
+    mongodb-version: "4.4"
     topology: ['replica_set', 'sharded_cluster']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index 96381da087..792771f038 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -91,7 +91,7 @@ buildvariants:
   matrix_spec:
     driver: [oldstable, min]
     ruby: ["ruby-2.7"]
-    mongodb-version: "4.0"
+    mongodb-version: "4.4"
     topology: ['replica_set', 'sharded_cluster']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 36ee777ffe..773e960551 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -118,6 +118,4 @@ if test -f tmp/rspec-all.json; then
   mv tmp/rspec-all.json tmp/rspec.json
 fi
 
-python3 -m mtools.mlaunch.mlaunch stop --dir "$dbdir" || true
-
 exit ${test_status}
diff --git a/spec/shared b/spec/shared
index 522fdda423..702f23f98b 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 522fdda423705751d4c282ed476e959c9ce90826
+Subproject commit 702f23f98b4be12fae3cf4d235a27a7985272251

From 09820628d457e8f80daf8dc54f0aac42a126ad32 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 10:41:04 +0200
Subject: [PATCH 08/10] Fix jruby; cmake; 5.0

---
 .evergreen/config.yml              | 8 ++++----
 .evergreen/config/variants.yml.erb | 8 ++++----
 .evergreen/run-tests.sh            | 7 +++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 656de16b38..348438f2db 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -690,7 +690,7 @@ buildvariants:
     driver: ["current"]
     topology: ['replica_set']
     mongodb-version: ['5.0']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -756,7 +756,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
     topology: "server"
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -869,7 +869,7 @@ buildvariants:
     topology: server
     app-tests: yes
     rails: ['6.0', '6.1']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
@@ -883,7 +883,7 @@ buildvariants:
 #    topology: server
 #    app-tests: yes
 #    rails: ['7.1']
-#    os: ubuntu-22.04
+#    os: ubuntu-20.04
 #  display_name: "app tests ${driver}, ${jruby}"
 #  tasks:
 #     - name: "test"
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index 792771f038..14bdb64ec9 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -49,7 +49,7 @@ buildvariants:
     driver: ["current"]
     topology: ['replica_set']
     mongodb-version: ['5.0']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -115,7 +115,7 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
     topology: "server"
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
@@ -228,7 +228,7 @@ buildvariants:
     topology: server
     app-tests: yes
     rails: ['6.0', '6.1']
-    os: ubuntu-22.04
+    os: ubuntu-20.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
@@ -242,7 +242,7 @@ buildvariants:
 #    topology: server
 #    app-tests: yes
 #    rails: ['7.1']
-#    os: ubuntu-22.04
+#    os: ubuntu-20.04
 #  display_name: "app tests ${driver}, ${jruby}"
 #  tasks:
 #     - name: "test"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 773e960551..8441dddfd2 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -30,6 +30,13 @@ eval "$(rbenv init - bash)"
 export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
 rbenv global $FULL_RUBY_VERSION
 
+export JAVA_HOME=/opt/java/jdk21
+export JAVACMD=$JAVA_HOME/bin/java
+
+if test "$FLE" = "helper"; then
+  sudo apt-get update && sudo apt-get install -y cmake
+fi
+
 if test -n "$APP_TESTS"; then
   set_env_node
 fi

From 265cbe57a1befd7d5eed79d6365905e2bef2d358 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 12:47:53 +0200
Subject: [PATCH 09/10] Last fixes

---
 .evergreen/config.yml              | 25 +++++++++++++------------
 .evergreen/config/variants.yml.erb | 25 +++++++++++++------------
 .evergreen/run-tests-atlas-full.sh | 16 +++++++++++++---
 .evergreen/run-tests.sh            |  6 ++++--
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 348438f2db..736e145914 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -772,18 +772,19 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "rails-master"
-  matrix_spec:
-    ruby: ["ruby-3.2"]
-    driver: ["current"]
-    mongodb-version: "7.0"
-    topology: "server"
-    rails: ['master']
-    os: ubuntu-22.04
-    fle: helper
-  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
-  tasks:
-    - name: "test"
+# Skip until Rails 8.1 supported
+#- matrix_name: "rails-master"
+#  matrix_spec:
+#    ruby: ["ruby-3.2"]
+#    driver: ["current"]
+#    mongodb-version: "7.0"
+#    topology: "server"
+#    rails: ['master']
+#    os: ubuntu-22.04
+#    fle: helper
+#  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+#  tasks:
+#    - name: "test"
 
 - matrix_name: "rails-8"
   matrix_spec:
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index 14bdb64ec9..08b57b68cd 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -131,18 +131,19 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "rails-master"
-  matrix_spec:
-    ruby: ["ruby-3.2"]
-    driver: ["current"]
-    mongodb-version: "7.0"
-    topology: "server"
-    rails: ['master']
-    os: ubuntu-22.04
-    fle: helper
-  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
-  tasks:
-    - name: "test"
+# Skip until Rails 8.1 supported
+#- matrix_name: "rails-master"
+#  matrix_spec:
+#    ruby: ["ruby-3.2"]
+#    driver: ["current"]
+#    mongodb-version: "7.0"
+#    topology: "server"
+#    rails: ['master']
+#    os: ubuntu-22.04
+#    fle: helper
+#  display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
+#  tasks:
+#    - name: "test"
 
 - matrix_name: "rails-8"
   matrix_spec:
diff --git a/.evergreen/run-tests-atlas-full.sh b/.evergreen/run-tests-atlas-full.sh
index f3114b8168..2c6f71a3b3 100755
--- a/.evergreen/run-tests-atlas-full.sh
+++ b/.evergreen/run-tests-atlas-full.sh
@@ -7,15 +7,25 @@ set -ex
 . `dirname "$0"`/functions.sh
 
 set_env_vars
-set_env_python
-set_env_ruby
+
+# Install rbenv and download the requested ruby version
+arch=`host_distro`
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
 
 export BUNDLE_GEMFILE=gemfiles/driver_master.gemfile
 bundle install
 
 ATLAS_URI=$MONGODB_URI \
   EXAMPLE_TIMEOUT=600 \
-  bundle exec rspec -fd spec/mongoid/search_indexable_spec.rb
+  bundle exec rspec -fd spec/mongoid/search_indexable_spec.rb \
+  --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml
 
 test_status=$?
 
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 8441dddfd2..3095655dc4 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -106,13 +106,15 @@ set +e
 if test -n "$TEST_CMD"; then
   eval $TEST_CMD
 elif test -n "$TEST_I18N_FALLBACKS"; then
-  bundle exec rspec spec/integration/i18n_fallbacks_spec.rb spec/mongoid/criteria_spec.rb spec/mongoid/contextual/mongo_spec.rb
+  bundle exec rspec spec/integration/i18n_fallbacks_spec.rb \
+    spec/mongoid/criteria_spec.rb spec/mongoid/contextual/mongo_spec.rb \
+    --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml
 elif test -n "$APP_TESTS"; then
   if test -z "$DOCKER_PRELOAD"; then
     ./spec/shared/bin/install-node
   fi
 
-  bundle exec rspec spec/integration/app_spec.rb
+  bundle exec rspec spec/integration/app_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml
 else
   bundle exec rake ci
 fi

From d6872a68b9cfdcf749e21a14f9a43fb59b011f77 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Thu, 23 Oct 2025 13:16:09 +0200
Subject: [PATCH 10/10] Cleanup

---
 .evergreen/config.yml              | 3 ---
 .evergreen/config/commands.yml.erb | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 736e145914..4266f26459 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -112,9 +112,6 @@ functions:
             AUTH=${AUTH} \
             SSL=${SSL} \
             ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
-            REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
-            LOAD_BALANCER=${LOAD_BALANCER} \
-            REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
             sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
       - command: expansions.update
         params:
diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
index 44176a71ec..4a0c9f7436 100644
--- a/.evergreen/config/commands.yml.erb
+++ b/.evergreen/config/commands.yml.erb
@@ -86,9 +86,6 @@ functions:
             AUTH=${AUTH} \
             SSL=${SSL} \
             ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
-            REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
-            LOAD_BALANCER=${LOAD_BALANCER} \
-            REQUIRE_API_VERSION=${API_VERSION_REQUIRED}
             sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
       - command: expansions.update
         params: