From 2a9f6f91cec73ad127c18a39f95a52d3a8de4c76 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 21 Jan 2026 10:46:16 +0100
Subject: [PATCH 1/3] Add 8.2 to the matrix

---
 .evergreen/config.yml              | 91 ++++++++++++++++++------------
 .evergreen/config/axes.yml.erb     |  8 +++
 .evergreen/config/standard.yml.erb | 13 ++++-
 .evergreen/mongosh_dl.py           |  1 +
 .mod/drivers-evergreen-tools       |  2 +-
 5 files changed, 75 insertions(+), 40 deletions(-)
 create mode 120000 .evergreen/mongosh_dl.py

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 4f9b4fb876..64913d077c 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -777,6 +777,14 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
+      - id: "latest"
+        display_name: "Latest"
+        variables:
+          MONGODB_VERSION: "latest"
+      - id: "8.2"
+        display_name: "8.2"
+        variables:
+          MONGODB_VERSION: "8.2"
       - id: "8.0"
         display_name: "8.0"
         variables:
@@ -1166,10 +1174,19 @@ axes:
         display_name: No
 
 buildvariants:
+  - matrix_name: "mongodb-latest"
+    matrix_spec:
+      ruby: "ruby-4.0"
+      mongodb-version: "8.2"
+      topology: ["standalone", "replica-set", "sharded-cluster"]
+      os: ubuntu2204
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
+    tasks:
+      - name: "run-main-test-suite"
   - matrix_name: "ruby-dev"
     matrix_spec:
       ruby: "ruby-dev"
-      mongodb-version: ["8.0", "7.0"]
+      mongodb-version: ["8.2", "8.0"]
       topology: "replica-set"
       os: ubuntu2404
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1179,7 +1196,7 @@ buildvariants:
   - matrix_name: DriverBench
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: standalone
       os: ubuntu2204
     display_name: DriverBench
@@ -1190,7 +1207,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-4.0"
-      mongodb-version: ["8.0", "7.0"]
+      mongodb-version: ["8.2", "8.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1201,7 +1218,7 @@ buildvariants:
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3", "ruby-3.2", "jruby-9.4"]
-      mongodb-version: ["8.0", "7.0"]
+      mongodb-version: ["8.2", "8.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1245,7 +1262,7 @@ buildvariants:
   - matrix_name: "single-lb"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: load-balanced
       single-mongos: single-mongos
       os: ubuntu2204
@@ -1269,7 +1286,7 @@ buildvariants:
   - matrix_name: "single-mongos"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: "sharded-cluster"
       single-mongos: single-mongos
       os: ubuntu2204
@@ -1281,7 +1298,7 @@ buildvariants:
   - matrix_name: CSOT
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: replica-set-single-node
       os: ubuntu2204
     display_name: "CSOT - ${mongodb-version}"
@@ -1292,7 +1309,7 @@ buildvariants:
   - matrix_name: OTel
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: replica-set-single-node
       os: ubuntu2204
     display_name: "OTel - ${mongodb-version}"
@@ -1304,7 +1321,7 @@ buildvariants:
     matrix_spec:
       retry-reads: no-retry-reads
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
@@ -1316,7 +1333,7 @@ buildvariants:
     matrix_spec:
       retry-writes: no-retry-writes
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: [replica-set, sharded-cluster]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
@@ -1328,7 +1345,7 @@ buildvariants:
     matrix_spec:
       lint: on
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
@@ -1339,7 +1356,7 @@ buildvariants:
     matrix_spec:
       fork: on
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} fork ${ruby}"
@@ -1350,7 +1367,7 @@ buildvariants:
     matrix_spec:
       solo: on
       ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3", "ruby-3.2", "ruby-3.1"]
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
@@ -1372,7 +1389,7 @@ buildvariants:
     matrix_spec:
       stress: on
       ruby: "ruby-4.0"
-      mongodb-version: ["8.0", "7.0"]
+      mongodb-version: ["8.2", "8.0"]
       topology: replica-set
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1383,7 +1400,7 @@ buildvariants:
 #    matrix_spec:
 #      auth-and-ssl: "x509"
 #      ruby: "ruby-4.0"
-#      mongodb-version: "8.0"
+#      mongodb-version: "8.2"
 #      topology: standalone
 #      os: ubuntu2204
 #    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1394,7 +1411,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: jruby-9.4
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1406,7 +1423,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: "replica-set"
       compressor: 'zlib'
       os: ubuntu2204
@@ -1419,7 +1436,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: "replica-set"
       compressor: 'snappy'
       os: ubuntu2204
@@ -1436,7 +1453,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: "replica-set"
       compressor: 'zstd'
       os: ubuntu2204
@@ -1448,7 +1465,7 @@ buildvariants:
   - matrix_name: activesupport-"ruby-4.0"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: replica-set
       as: as
       os: ubuntu2204
@@ -1460,7 +1477,7 @@ buildvariants:
   - matrix_name: bson-"ruby-4.0"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: replica-set
       bson: "*"
       os: ubuntu2204
@@ -1551,7 +1568,7 @@ buildvariants:
   - matrix_name: "kerberos-unit"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       topology: standalone
       os: ubuntu2204
       auth-and-ssl: kerberos
@@ -1580,7 +1597,7 @@ buildvariants:
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-web-identity ]
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1593,7 +1610,7 @@ buildvariants:
       # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
       ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3", "ruby-3.2", "ruby-3.1"]
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1607,7 +1624,7 @@ buildvariants:
       ocsp-delegate: on
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
@@ -1620,7 +1637,7 @@ buildvariants:
       ocsp-status: unknown
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
@@ -1636,7 +1653,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1651,7 +1668,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1666,7 +1683,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1681,7 +1698,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1696,7 +1713,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1711,7 +1728,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1726,7 +1743,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1741,7 +1758,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1756,7 +1773,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: "ruby-4.0"
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1777,7 +1794,7 @@ buildvariants:
       ocsp-connectivity: pass
       ruby: jruby-9.4
       topology: standalone
-      mongodb-version: "8.0"
+      mongodb-version: "8.2"
       os: ubuntu2204
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
     tags: ["pr"]
@@ -1791,7 +1808,7 @@ buildvariants:
   #    fle: helper
   #    topology: standalone
   #    os: ubuntu2204
-  #    mongodb-version: "8.0"
+  #    mongodb-version: "8.2"
   #  display_name: "GCP KMS"
   #  tasks:
   #    - name: testgcpkms_task_group
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index 66f1ec5f9b..89f809c691 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -2,6 +2,14 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
+      - id: "latest"
+        display_name: "Latest"
+        variables:
+          MONGODB_VERSION: "latest"
+      - id: "8.2"
+        display_name: "8.2"
+        variables:
+          MONGODB_VERSION: "8.2"
       - id: "8.0"
         display_name: "8.0"
         variables:
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 3479edd631..cbffdfe788 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -27,13 +27,22 @@
                      jrubies
 
   # The latest stable version of MongoDB
-  latest_stable_mdb = "8.0".inspect # so it gets quoted as a string
+  latest_stable_mdb = "8.2".inspect # so it gets quoted as a string
 
 
-  recent_mdb = %w( 8.0 7.0 )
+  recent_mdb = %w( 8.2 8.0 )
 %>
 
 buildvariants:
+  - matrix_name: "mongodb-latest"
+    matrix_spec:
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: ubuntu2204
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
+    tasks:
+      - name: "run-main-test-suite"
   - matrix_name: "ruby-dev"
     matrix_spec:
       ruby: "ruby-dev"
diff --git a/.evergreen/mongosh_dl.py b/.evergreen/mongosh_dl.py
new file mode 120000
index 0000000000..9a234910ec
--- /dev/null
+++ b/.evergreen/mongosh_dl.py
@@ -0,0 +1 @@
+../.mod/drivers-evergreen-tools/.evergreen/mongosh_dl.py
\ No newline at end of file
diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools
index 9142b7055e..2c5cb1f78e 160000
--- a/.mod/drivers-evergreen-tools
+++ b/.mod/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit 9142b7055ea5940e59ad41c4b069376f867031da
+Subproject commit 2c5cb1f78e056749d6ede5296ad4d77510bd715d

From 058cc614c55b202390c27bcf76a513eaacb33d12 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 21 Jan 2026 14:19:40 +0100
Subject: [PATCH 2/3] Fix latest

---
 .evergreen/config.yml              | 3 ++-
 .evergreen/config/standard.yml.erb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 64913d077c..42fd830115 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1177,12 +1177,13 @@ buildvariants:
   - matrix_name: "mongodb-latest"
     matrix_spec:
       ruby: "ruby-4.0"
-      mongodb-version: "8.2"
+      mongodb-version: "latest"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "run-main-test-suite"
+
   - matrix_name: "ruby-dev"
     matrix_spec:
       ruby: "ruby-dev"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index cbffdfe788..9076303a54 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -37,12 +37,13 @@ buildvariants:
   - matrix_name: "mongodb-latest"
     matrix_spec:
       ruby: <%= latest_ruby %>
-      mongodb-version: <%= latest_stable_mdb %>
+      mongodb-version: "latest"
       topology: <%= topologies %>
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "run-main-test-suite"
+
   - matrix_name: "ruby-dev"
     matrix_spec:
       ruby: "ruby-dev"

From 4ff55c732544565035d7b5c7cbd5f63b8c9d8865 Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Wed, 21 Jan 2026 16:02:06 +0100
Subject: [PATCH 3/3] wip

---
 .evergreen/config.yml              | 2 +-
 .evergreen/config/standard.yml.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 42fd830115..0718978072 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1558,7 +1558,7 @@ buildvariants:
       auth-and-ssl: "noauth-and-nossl"
       ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3", "ruby-3.2", "ruby-3.1"]
       topology: [replica-set, sharded-cluster]
-      mongodb-version: [ '6.0', '7.0', '8.0' ]
+      mongodb-version: [ '6.0', '7.0' ]
       os: ubuntu2204
       fle: helper
     display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 9076303a54..4276c14a58 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -358,7 +358,7 @@ buildvariants:
       auth-and-ssl: "noauth-and-nossl"
       ruby: <%= supported_mri_rubies_3_ubuntu %>
       topology: [replica-set, sharded-cluster]
-      mongodb-version: [ '6.0', '7.0', '8.0' ]
+      mongodb-version: [ '6.0', '7.0' ]
       os: ubuntu2204
       fle: helper
     display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"