From 3cdb17dd6591ee950cbc1ec8cf8626434c3f8592 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Tue, 2 May 2023 09:08:51 -0600
Subject: [PATCH 01/41] Bump to latest toolchain and clean up specs to use
 consistent (and modern) build hosts

---
 .evergreen/config.yml               | 634 ++++++++--------------------
 .evergreen/config/axes.yml.erb      |  44 +-
 .evergreen/config/standard.yml.erb  | 553 +++++++-----------------
 .evergreen/update-evergreen-configs |  30 --
 spec/shared                         |   2 +-
 spec/solo/clean_exit_spec.rb        |  12 +-
 6 files changed, 355 insertions(+), 920 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 0290da04c1..d43037fd5a 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -730,6 +730,14 @@ axes:
   - id: "ruby"
     display_name: Ruby Version
     values:
+      - id: "ruby-3.2"
+        display_name: ruby-3.2
+        variables:
+          RVM_RUBY: "ruby-3.2"
+      - id: "ruby-3.1"
+        display_name: ruby-3.1
+        variables:
+          RVM_RUBY: "ruby-3.1"
       - id: "ruby-3.1"
         display_name: ruby-3.1
         variables:
@@ -762,51 +770,41 @@ axes:
         display_name: jruby-9.3
         variables:
           RVM_RUBY: "jruby-9.3"
-
+      - id: "jruby-9.4"
+        display_name: jruby-9.4
+        variables:
+          RVM_RUBY: "jruby-9.4"
+  
   - id: "os"
     display_name: OS
     values:
       - id: debian11
         display_name: "Debian 11"
         run_on: debian11-small
-      - id: ubuntu2004
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2004-small
-      - id: ubuntu1804
-        display_name: "Ubuntu 18.04"
-        run_on: ubuntu1804-small
-      - id: ubuntu1604
-        display_name: "Ubuntu 16.04"
-        run_on: ubuntu1604-small
-      - id: rhel80
+      - id: ubuntu2204
+        display_name: "Ubuntu 22.04"
+        run_on: ubuntu2204-small
+      - id: ubuntu2204-arm
+        display_name: "Ubuntu 22.04 ARM64"
+        run_on: ubuntu2204-arm64-small
+      - id: rhel8
         display_name: "RHEL 8"
-        run_on: rhel80-small
-      - id: rhel70
-        display_name: "RHEL 7"
-        run_on: rhel70-small
-      - id: rhel62
-        display_name: "RHEL 6"
-        run_on: rhel62-small
+        run_on: rhel84-small
+      - id: rhel8-arm
+        display_name: "RHEL 8 ARM64"
+        run_on: rhel82-arm64-small
 
   - id: docker-distro
     display_name: Docker Distro
     values:
-        - id: debian92
-          display_name: debian92
+        - id: debian11
+          display_name: debian11
           variables:
-            DOCKER_DISTRO: debian92
-        - id: debian10
-          display_name: debian10
+            DOCKER_DISTRO: debian11
+        - id: ubuntu2204
+          display_name: ubuntu2204
           variables:
-            DOCKER_DISTRO: debian10
-        - id: ubuntu1804
-          display_name: ubuntu1804
-          variables:
-            DOCKER_DISTRO: ubuntu1804
-        - id: ubuntu2004
-          display_name: ubuntu2004
-          variables:
-            DOCKER_DISTRO: ubuntu2004
+            DOCKER_DISTRO: ubuntu2204
 
   - id: "compressor"
     display_name: Compressor
@@ -1002,112 +1000,46 @@ axes:
         display_name: No
 
 buildvariants:
-  - matrix_name: "docker"
-    matrix_spec:
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.2"
-      topology: standalone
-      os: ubuntu1804
-      preload: preload
-    display_name: "Docker ${os} ${mongodb-version} ${topology} ${ruby} ${preload}"
-    tasks:
-      - name: "test-docker"
-
-  - matrix_name: "docker"
-    matrix_spec:
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.2"
-      topology: standalone
-      os: ubuntu1804
-      preload: nopreload
-    display_name: "Docker ${os} ${mongodb-version} ${topology} ${ruby} ${preload}"
-    tasks:
-      - name: "test-docker"
-
-  - matrix_name: "mongo-latest"
+  - matrix_name: "mongo-recent"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['latest']
+      ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
+      mongodb-version: ['latest', '7.0', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu2004
+      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "mongo-6.0"
+  - matrix_name: "mongo-5.x"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['6.0']
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu2004
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-5.3"
-    matrix_spec:
-      auth-and-ssl: noauth-and-nossl
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['5.3']
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: ['5.3', '5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-
-  - matrix_name: "mongo-4.2"
+  
+  - matrix_name: "mongo-4.x"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-2.7", "ruby-2.5"]
-      mongodb-version: ['4.2']
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-4.0"
-    matrix_spec:
-      auth-and-ssl: ["noauth-and-ssl", "auth-and-nossl"]
-      ruby: "ruby-2.6"
-      mongodb-version: ['4.0']
+      ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
+      mongodb-version: ['4.4', '4.2', '4.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-
+  
   - matrix_name: "mongo-3.6"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-2.5"
       mongodb-version: ['3.6']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1604
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-4.4"
-    matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: '4.4'
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-5.0"
-    matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1", "ruby-2.7"]
-      mongodb-version: '5.0'
-      topology: '*'
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1115,11 +1047,11 @@ buildvariants:
   - matrix_name: "single-lb"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.0"]
-      mongodb-version: '5.0'
+      ruby: ruby-3.2
+      mongodb-version: ['7.0', '6.0']
       topology: load-balanced
       single-mongos: single-mongos
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} single-lb ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1127,11 +1059,11 @@ buildvariants:
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
+      ruby: ruby-3.2
       mongodb-version: '5.0'
       topology: standalone
       api-version-required: yes
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} api-version-required ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1139,11 +1071,11 @@ buildvariants:
   - matrix_name: "single-mongos"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: "ruby-2.6"
-      mongodb-version: ['4.0', '4.2', '4.4']
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: "sharded-cluster"
       single-mongos: single-mongos
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} single-mongos ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1151,10 +1083,10 @@ buildvariants:
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
-      ruby: "ruby-2.6"
-      mongodb-version: ["4.0"]
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1162,10 +1094,10 @@ buildvariants:
   - matrix_name: "no-retry-writes"
     matrix_spec:
       retry-writes: no-retry-writes
-      ruby: ["ruby-2.7"]
-      mongodb-version: ["4.0"]
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: [replica-set, sharded-cluster]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1176,18 +1108,18 @@ buildvariants:
       mongodb-version: ['3.6', '4.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       storage-engine: mmapv1
-      os: ubuntu1604
+      os: rhel8
     display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "lint-5.0"
+  - matrix_name: "lint"
     matrix_spec:
       lint: on
-      ruby: ["ruby-3.1", "ruby-2.7"]
-      mongodb-version: ["5.0"]
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: '*'
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1195,10 +1127,10 @@ buildvariants:
   - matrix_name: "fork"
     matrix_spec:
       fork: on
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: ["4.4"]
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} fork ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1206,10 +1138,10 @@ buildvariants:
   - matrix_name: "solo"
     matrix_spec:
       solo: on
-      ruby: [ruby-3.1, ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2, jruby-9.3]
-      mongodb-version: ["4.4"]
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      mongodb-version: 
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1220,7 +1152,7 @@ buildvariants:
       ruby: ["ruby-2.7"]
       mongodb-version: ['4.2', '4.0', '3.6']
       topology: replica-set
-      os: ubuntu1604
+      os: rhel8
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1228,10 +1160,10 @@ buildvariants:
   - matrix_name: "stress"
     matrix_spec:
       stress: on
-      ruby: ["ruby-2.7"]
-      mongodb-version: ['5.0', '4.4']
+      ruby: ruby-3.2
+      mongodb-version: ["6.0", "5.3"]
       topology: replica-set
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1239,10 +1171,10 @@ buildvariants:
   - matrix_name: "x509-tests"
     matrix_spec:
       auth-and-ssl: "x509"
-      ruby: "ruby-2.7"
-      mongodb-version: "4.2"
+      ruby: ruby-3.2
+      mongodb-version: ["6.0", "5.3"]
       topology: standalone
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1250,10 +1182,10 @@ buildvariants:
   - matrix_name: "jruby-auth"
     matrix_spec:
       auth-and-ssl: "auth-and-ssl"
-      ruby: "jruby-9.3"
-      mongodb-version: "4.2"
+      ruby: jruby-9.4
+      mongodb-version: 6.0
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: rhel80
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1261,172 +1193,65 @@ buildvariants:
   - matrix_name: "jruby-noauth"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: "jruby-9.2"
-      mongodb-version: "3.6"
+      ruby: jruby-9.4
+      mongodb-version: 6.0
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "zlib-auth"
+  - matrix_name: "zlib"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: 6.0
       topology: "replica-set"
       compressor: 'zlib'
-      os: ubuntu1804
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "zlib-auth-3.0"
+  - matrix_name: "snappy"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.0"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'zlib'
-      os: ubuntu2004
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zlib-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: "3.6"
-      topology: replica-set
-      compressor: 'zlib'
-      os: ubuntu1604
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "snappy-auth"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: 6.0
       topology: "replica-set"
       compressor: 'snappy'
-      os: ubuntu1804
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "snappy-auth-3"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.1"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'snappy'
-      os: ubuntu2004
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "snappy-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: ["3.6"]
-      topology: replica-set
-      compressor: 'snappy'
-      os: ubuntu1604
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-#  https://jira.mongodb.org/browse/RUBY-2723
-#  Enable or remove when the ticket is resolved.
-#  - matrix_name: "snappy-jruby"
-#    matrix_spec:
-#      ruby: jruby-9.2
-#      mongodb-version: "4.4"
-#      topology: replica-set
-#      compressor: 'snappy'
-#      os: ubuntu1804
-#    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#    tasks:
-#      - name: "test-mlaunch"
-
   - matrix_name: "zstd-auth"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: 6.0
       topology: "replica-set"
       compressor: 'zstd'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zstd-auth-3.0"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.0"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'zstd'
-      os: ubuntu1804
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "zstd-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: "4.2"
-      topology: replica-set
-      compressor: 'zstd'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-#  - matrix_name: "zstd-jruby"
-#    matrix_spec:
-#      ruby: jruby-9.2
-#      mongodb-version: "4.4"
-#      topology: replica-set
-#      compressor: 'zstd'
-#      os: ubuntu1804
-#    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#    tasks:
-#      - name: "test-mlaunch"
-
-#   - matrix_name: "ruby-head"
-#     matrix_spec:
-#       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-#       ruby: ["ruby-head"]
-#       mongodb-version: "4.2"
-#       topology: "*"
-#       os: ubuntu1804
-#     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#     tasks:
-#       - name: "test-mlaunch"
-
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: '4.4'
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: 6.0
       topology: replica-set
       as: as
-      os: ubuntu1804
+      os: rhel8
     display_name: "AS ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: [ruby-3.1, ruby-2.7, jruby-9.2]
-      mongodb-version: '4.4'
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      mongodb-version: 6.0
       topology: replica-set
       bson: "*"
       os: rhel80
@@ -1434,186 +1259,69 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "kerberos-integration-ubuntu"
+  - matrix_name: "kerberos-integration"
     matrix_spec:
-      # Other Rubies segfault
-      ruby: ruby-2.5
-    display_name: "Kerberos integration Ubuntu ${ruby}"
-    run_on:
-      - ubuntu1804-small
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      os: [ ubuntu2204, rhel8 ]
+    display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
       - name: "test-kerberos-integration"
 
-  # All skipped because of segfaults
-  #- matrix_name: "kerberos-integration-rhel"
-  #  matrix_spec:
-  #    # Other Rubies segfault
-  #    ruby: [ruby-2.7]
-  #    os: ubuntu1804
-  #  display_name: "Kerberos integration RHEL ${ruby} ${os}"
-  #  tasks:
-  #    - name: "test-kerberos-integration"
-
-  # Kerberos integration tests on debian are omitted due to segfaults:
-  # https://jira.mongodb.org/browse/RUBY-1534
-
   - matrix_name: "kerberos-unit"
     matrix_spec:
-      ruby: "ruby-2.6"
-      mongodb-version: "4.2"
+      ruby: ruby-3.2
+      mongodb-version: 6.0
       topology: standalone
-      os: ubuntu1804
+      os: rhel8
       auth-and-ssl: kerberos
     display_name: "Kerberos Tests"
     tasks:
       - name: "test-kerberos"
 
-  - matrix_name: "fle-latest"
+  - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1]
+      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
       topology: [replica-set, sharded-cluster]
-      mongodb-version: ['latest']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu2004
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-6.0"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
-      topology: [replica-set, sharded-cluster]
-      mongodb-version: ['6.0']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu2004
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.4"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1]
-      topology: standalone
-      mongodb-version: ['4.4']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.2"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-2.5]
-      topology: [standalone, replica-set, sharded-cluster]
-      mongodb-version: ["4.2"]
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${topology} ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.0"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-2.6]
-      topology: standalone
-      mongodb-version: ["4.0"]
-      os: ubuntu2004
-      fle: path
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  # https://jira.mongodb.org/browse/RUBY-3217
-  - matrix_name: "fle-jruby"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [jruby-9.2, jruby-9.3]
-      topology: standalone
-      mongodb-version: ['5.0']
-      os: ubuntu2004
+      mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
+      os: rhel8
       fle: helper
-      docker-distro: ubuntu2004
     display_name: "FLE: ${mongodb-version} ${ruby}"
     tasks:
-      - name: "test-fle-via-docker"
+      - name: "test-fle"
 
   - matrix_name: aws-auth-regular
     matrix_spec:
-      auth-and-ssl: aws-regular
-      ruby: [ruby-2.7]
+      auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
+      ruby: ruby-3.2
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu1804
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "AWS auth regular: ${mongodb-version} ${ruby}"
     tasks:
       - name: "test-aws-auth"
 
-  - matrix_name: aws-auth-temporary
-    matrix_spec:
-      auth-and-ssl: [aws-assume-role, aws-ec2, aws-ecs, aws-web-identity]
-      ruby: [ruby-3.1]
-      topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu1804
-    display_name: "AWS auth temporary: ${auth-and-ssl} ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-aws-auth"
-
-  # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
-  # TODO Add ruby-3.0: RUBY-2717
-  
-  - matrix_name: ocsp-verifier - ruby-2.5
-    matrix_spec:
-      ocsp-verifier: true
-      ruby: ruby-2.5
-      topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
-      docker-distro: debian10
-    display_name: 'OCSP verifier: ${mongodb-version} ${ruby}'
-    tasks: &1
-    - name: test-via-docker
-  - matrix_name: ocsp-verifier - ruby-2.6
-    matrix_spec:
-      ocsp-verifier: true
-      ruby: ruby-2.6
-      topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
-      docker-distro: debian10
-    display_name: 'OCSP verifier: ${mongodb-version} ${ruby}'
-    tasks: *1
-  - matrix_name: ocsp-verifier - ruby-2.7
+  - matrix_name: ocsp-verifier
     matrix_spec:
       ocsp-verifier: true
-      ruby: ruby-2.7
+      # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
-      docker-distro: debian10
-    display_name: 'OCSP verifier: ${mongodb-version} ${ruby}'
-    tasks: *1
-  
+      mongodb-version: 6.0
+      os: rhel8
+    display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
+    tasks:
+      - name: test-mlaunch
 
   - matrix_name: ocsp-must-staple
     matrix_spec:
       ocsp-algorithm: ecdsa
       ocsp-must-staple: on
       ocsp-delegate: on
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
     tasks:
@@ -1623,10 +1331,10 @@ buildvariants:
     matrix_spec:
       ocsp-algorithm: rsa
       ocsp-status: unknown
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
     tasks:
@@ -1639,10 +1347,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1653,10 +1361,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1667,10 +1375,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: fail
       extra-uri-options: "none"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1681,10 +1389,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1695,10 +1403,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1709,10 +1417,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1723,10 +1431,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1737,10 +1445,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1751,10 +1459,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1771,43 +1479,41 @@ buildvariants:
       ocsp-status: [valid, unknown]
       ocsp-delegate: '*'
       ocsp-connectivity: pass
-      ruby: jruby-9.2
+      ruby: jruby-9.4
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: 6.0
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
 
   - matrix_name: testgcpkms-variant
     matrix_spec:
-      ruby: ruby-3.0
+      ruby: ruby-3.2
       fle: helper
       topology: standalone
-      os: debian11
+      os: rhel8
       mongodb-version: 6.0
     display_name: "GCP KMS"
     tasks:
       - name: testgcpkms_task_group
         batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-  - matrix_name: "atlas"
+  - matrix_name: atlas
     matrix_spec:
-      ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.2"]
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      os: rhel8
     display_name: "Atlas tests ${ruby}"
-    run_on:
-      - ubuntu1804-small
     tasks:
        - name: test-atlas
 
   - matrix_name: "serverless"
     matrix_spec:
       # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.3"]
-      ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1"]
+      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       fle: path
+      os: rhel8
     display_name: "Atlas serverless ${ruby} single mongos"
-    run_on:
-      - ubuntu2004-small
     tasks:
        - name: test-serverless
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index d925a355b8..5180c97c5c 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -138,6 +138,14 @@ axes:
   - id: "ruby"
     display_name: Ruby Version
     values:
+      - id: "ruby-3.2"
+        display_name: ruby-3.2
+        variables:
+          RVM_RUBY: "ruby-3.2"
+      - id: "ruby-3.1"
+        display_name: ruby-3.1
+        variables:
+          RVM_RUBY: "ruby-3.1"
       - id: "ruby-3.1"
         display_name: ruby-3.1
         variables:
@@ -170,36 +178,34 @@ axes:
         display_name: jruby-9.3
         variables:
           RVM_RUBY: "jruby-9.3"
-
+      - id: "jruby-9.4"
+        display_name: jruby-9.4
+        variables:
+          RVM_RUBY: "jruby-9.4"
+  
   - id: "os"
     display_name: OS
     values:
       - id: debian11
         display_name: "Debian 11"
         run_on: debian11-small
-      - id: ubuntu2004
-        display_name: "Ubuntu 20.04"
-        run_on: ubuntu2004-small
-      - id: ubuntu1804
-        display_name: "Ubuntu 18.04"
-        run_on: ubuntu1804-small
-      - id: ubuntu1604
-        display_name: "Ubuntu 16.04"
-        run_on: ubuntu1604-small
-      - id: rhel80
+      - id: ubuntu2204
+        display_name: "Ubuntu 22.04"
+        run_on: ubuntu2204-small
+      - id: ubuntu2204-arm
+        display_name: "Ubuntu 22.04 ARM64"
+        run_on: ubuntu2204-arm64-small
+      - id: rhel8
         display_name: "RHEL 8"
-        run_on: rhel80-small
-      - id: rhel70
-        display_name: "RHEL 7"
-        run_on: rhel70-small
-      - id: rhel62
-        display_name: "RHEL 6"
-        run_on: rhel62-small
+        run_on: rhel84-small
+      - id: rhel8-arm
+        display_name: "RHEL 8 ARM64"
+        run_on: rhel82-arm64-small
 
   - id: docker-distro
     display_name: Docker Distro
     values:
-      <% %w(debian92 debian10 ubuntu1804 ubuntu2004).each do |distro| %>
+      <% %w(debian11 ubuntu2204).each do |distro| %>
         - id: <%= distro %>
           display_name: <%= distro %>
           variables:
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index ec401e2012..61fdda0c6f 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -1,112 +1,79 @@
-<% tt = %w(standalone replica-set sharded-cluster) %>
+<%
+  topologies = %w( standalone replica-set sharded-cluster )
 
-buildvariants:
-  - matrix_name: "docker"
-    matrix_spec:
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.2"
-      topology: standalone
-      os: ubuntu1804
-      preload: preload
-    display_name: "Docker ${os} ${mongodb-version} ${topology} ${ruby} ${preload}"
-    tasks:
-      - name: "test-docker"
+  # latest_ruby = the most recently released, stable version of Ruby
+  #    (make sure this version is being built by 10gen/mongo-ruby-toolchain)
+  latest_ruby = "ruby-3.2"
 
-  - matrix_name: "docker"
-    matrix_spec:
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.2"
-      topology: standalone
-      os: ubuntu1804
-      preload: nopreload
-    display_name: "Docker ${os} ${mongodb-version} ${topology} ${ruby} ${preload}"
-    tasks:
-      - name: "test-docker"
+  # these are used for testing against a few recent ruby versions
+  recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.4 )
 
-  - matrix_name: "mongo-latest"
-    matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['latest']
-      topology: <%= tt %>
-      os: ubuntu2004
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # this is a list of the most most recent 3.x and 2.x MRI ruby versions
+  sample_mri_rubies = %w( ruby-3.2 ruby-2.7 )
 
-  - matrix_name: "mongo-6.0"
-    matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['6.0']
-      topology: <%= tt %>
-      os: ubuntu2004
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # as above, but including the most recent JRuby release
+  sample_rubies = sample_mri_rubies + %w( jruby-9.4 )
 
-  - matrix_name: "mongo-5.3"
-    matrix_spec:
-      auth-and-ssl: noauth-and-nossl
-      ruby: ["ruby-3.1"]
-      mongodb-version: ['5.3']
-      topology: <%= tt %>
-      os: ubuntu2004
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # older Ruby versions provided by 10gen/mongo-ruby-toolchain
+  older_rubies = %w( ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 )
 
-  - matrix_name: "mongo-4.2"
-    matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-2.7", "ruby-2.5"]
-      mongodb-version: ['4.2']
-      topology: <%= tt %>
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
+  jrubies = %w( jruby-9.4 jruby-9.3 jruby-9.2 )
+
+  supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
+                             ruby-2.7 ruby-2.6 ruby-2.5 )
+  
+  supported_rubies = supported_mri_rubies +
+                     %w( jruby-9.4 jruby-9.3 jruby-9.2 )
+
+  # The latest stable version of MongoDB
+  latest_stable_mdb = "6.0"
 
-  - matrix_name: "mongo-4.0"
+  # A few of the most recent MongoDB versions
+  recent_mdb = %w( 6.0 5.3 )
+%>
+
+buildvariants:
+  - matrix_name: "mongo-recent"
     matrix_spec:
-      auth-and-ssl: ["noauth-and-ssl", "auth-and-nossl"]
-      ruby: "ruby-2.6"
-      mongodb-version: ['4.0']
-      topology: <%= tt %>
-      os: ubuntu1804
+      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
+      ruby: <%= recent_rubies %>
+      mongodb-version: ['latest', '7.0', '6.0']
+      topology: <%= topologies %>
+      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "mongo-3.6"
+  - matrix_name: "mongo-5.x"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: "ruby-2.5"
-      mongodb-version: ['3.6']
-      topology: <%= tt %>
-      os: ubuntu1604
+      ruby: <%= sample_rubies %>
+      mongodb-version: ['5.3', '5.0']
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-
-  - matrix_name: "mongo-4.4"
+  
+  - matrix_name: "mongo-4.x"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: '4.4'
-      topology: <%= tt %>
-      os: ubuntu1804
+      ruby: <%= older_rubies %>
+      mongodb-version: ['4.4', '4.2', '4.0']
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-
-  - matrix_name: "mongo-5.0"
+  
+  - matrix_name: "mongo-3.6"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1", "ruby-2.7"]
-      mongodb-version: '5.0'
-      topology: '*'
-      os: ubuntu1804
+      ruby: "ruby-2.5"
+      mongodb-version: ['3.6']
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -114,11 +81,11 @@ buildvariants:
   - matrix_name: "single-lb"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.0"]
-      mongodb-version: '5.0'
+      ruby: <%= latest_ruby %>
+      mongodb-version: ['7.0', '6.0']
       topology: load-balanced
       single-mongos: single-mongos
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} single-lb ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -126,11 +93,11 @@ buildvariants:
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ["ruby-3.1"]
+      ruby: <%= latest_ruby %>
       mongodb-version: '5.0'
       topology: standalone
       api-version-required: yes
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} api-version-required ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -138,11 +105,11 @@ buildvariants:
   - matrix_name: "single-mongos"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: "ruby-2.6"
-      mongodb-version: ['4.0', '4.2', '4.4']
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: "sharded-cluster"
       single-mongos: single-mongos
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} single-mongos ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -150,10 +117,10 @@ buildvariants:
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
-      ruby: "ruby-2.6"
-      mongodb-version: ["4.0"]
-      topology: <%= tt %>
-      os: ubuntu1804
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -161,10 +128,10 @@ buildvariants:
   - matrix_name: "no-retry-writes"
     matrix_spec:
       retry-writes: no-retry-writes
-      ruby: ["ruby-2.7"]
-      mongodb-version: ["4.0"]
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: [replica-set, sharded-cluster]
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -173,20 +140,20 @@ buildvariants:
     matrix_spec:
       ruby: "ruby-2.5"
       mongodb-version: ['3.6', '4.0']
-      topology: <%= tt %>
+      topology: <%= topologies %>
       storage-engine: mmapv1
-      os: ubuntu1604
+      os: rhel8
     display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "lint-5.0"
+  - matrix_name: "lint"
     matrix_spec:
       lint: on
-      ruby: ["ruby-3.1", "ruby-2.7"]
-      mongodb-version: ["5.0"]
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: '*'
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -194,10 +161,10 @@ buildvariants:
   - matrix_name: "fork"
     matrix_spec:
       fork: on
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: ["4.4"]
-      topology: <%= tt %>
-      os: ubuntu1804
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} fork ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -205,10 +172,10 @@ buildvariants:
   - matrix_name: "solo"
     matrix_spec:
       solo: on
-      ruby: [ruby-3.1, ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2, jruby-9.3]
-      mongodb-version: ["4.4"]
-      topology: <%= tt %>
-      os: ubuntu1804
+      ruby: <%= supported_rubies %>
+      mongodb-version: <% latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -219,7 +186,7 @@ buildvariants:
       ruby: ["ruby-2.7"]
       mongodb-version: ['4.2', '4.0', '3.6']
       topology: replica-set
-      os: ubuntu1604
+      os: rhel8
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -227,10 +194,10 @@ buildvariants:
   - matrix_name: "stress"
     matrix_spec:
       stress: on
-      ruby: ["ruby-2.7"]
-      mongodb-version: ['5.0', '4.4']
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= recent_mdb %>
       topology: replica-set
-      os: ubuntu2004
+      os: rhel8
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -238,10 +205,10 @@ buildvariants:
   - matrix_name: "x509-tests"
     matrix_spec:
       auth-and-ssl: "x509"
-      ruby: "ruby-2.7"
-      mongodb-version: "4.2"
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= recent_mdb %>
       topology: standalone
-      os: ubuntu1804
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -249,10 +216,10 @@ buildvariants:
   - matrix_name: "jruby-auth"
     matrix_spec:
       auth-and-ssl: "auth-and-ssl"
-      ruby: "jruby-9.3"
-      mongodb-version: "4.2"
-      topology: <%= tt %>
-      os: rhel80
+      ruby: <%= jrubies.first %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -260,172 +227,65 @@ buildvariants:
   - matrix_name: "jruby-noauth"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: "jruby-9.2"
-      mongodb-version: "3.6"
-      topology: <%= tt %>
-      os: ubuntu1804
+      ruby: <%= jrubies.first %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "zlib-auth"
+  - matrix_name: "zlib"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: <%= sample_rubies %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: "replica-set"
       compressor: 'zlib'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zlib-auth-3.0"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.0"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'zlib'
-      os: ubuntu2004
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zlib-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: "3.6"
-      topology: replica-set
-      compressor: 'zlib'
-      os: ubuntu1604
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "snappy-auth"
+  - matrix_name: "snappy"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: <%= sample_rubies %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: "replica-set"
       compressor: 'snappy'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "snappy-auth-3"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.1"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'snappy'
-      os: ubuntu2004
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "snappy-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: ["3.6"]
-      topology: replica-set
-      compressor: 'snappy'
-      os: ubuntu1604
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-#  https://jira.mongodb.org/browse/RUBY-2723
-#  Enable or remove when the ticket is resolved.
-#  - matrix_name: "snappy-jruby"
-#    matrix_spec:
-#      ruby: jruby-9.2
-#      mongodb-version: "4.4"
-#      topology: replica-set
-#      compressor: 'snappy'
-#      os: ubuntu1804
-#    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#    tasks:
-#      - name: "test-mlaunch"
-
   - matrix_name: "zstd-auth"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-2.7"]
-      mongodb-version: "4.4"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
+      ruby: <%= sample_rubies %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: "replica-set"
       compressor: 'zstd'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zstd-auth-3.0"
-    matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: ["ruby-3.0"]
-      mongodb-version: "4.4"
-      topology: "standalone"
-      compressor: 'zstd'
-      os: ubuntu1804
-    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "zstd-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-2.5"
-      mongodb-version: "4.2"
-      topology: replica-set
-      compressor: 'zstd'
-      os: ubuntu1804
+      os: rhel8
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-#  - matrix_name: "zstd-jruby"
-#    matrix_spec:
-#      ruby: jruby-9.2
-#      mongodb-version: "4.4"
-#      topology: replica-set
-#      compressor: 'zstd'
-#      os: ubuntu1804
-#    display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#    tasks:
-#      - name: "test-mlaunch"
-
-#   - matrix_name: "ruby-head"
-#     matrix_spec:
-#       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-#       ruby: ["ruby-head"]
-#       mongodb-version: "4.2"
-#       topology: "*"
-#       os: ubuntu1804
-#     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-#     tasks:
-#       - name: "test-mlaunch"
-
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.0", "ruby-2.7"]
-      mongodb-version: '4.4'
+      ruby: <%= sample_rubies %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: replica-set
       as: as
-      os: ubuntu1804
+      os: rhel8
     display_name: "AS ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: [ruby-3.1, ruby-2.7, jruby-9.2]
-      mongodb-version: '4.4'
+      ruby: <%= sample_rubies %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: replica-set
       bson: "*"
       os: rhel80
@@ -433,166 +293,69 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "kerberos-integration-ubuntu"
+  - matrix_name: "kerberos-integration"
     matrix_spec:
-      # Other Rubies segfault
-      ruby: ruby-2.5
-    display_name: "Kerberos integration Ubuntu ${ruby}"
-    run_on:
-      - ubuntu1804-small
+      ruby: <%= sample_rubies %>
+      os: [ ubuntu2204, rhel8 ]
+    display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
       - name: "test-kerberos-integration"
 
-  # All skipped because of segfaults
-  #- matrix_name: "kerberos-integration-rhel"
-  #  matrix_spec:
-  #    # Other Rubies segfault
-  #    ruby: [ruby-2.7]
-  #    os: ubuntu1804
-  #  display_name: "Kerberos integration RHEL ${ruby} ${os}"
-  #  tasks:
-  #    - name: "test-kerberos-integration"
-
-  # Kerberos integration tests on debian are omitted due to segfaults:
-  # https://jira.mongodb.org/browse/RUBY-1534
-
   - matrix_name: "kerberos-unit"
     matrix_spec:
-      ruby: "ruby-2.6"
-      mongodb-version: "4.2"
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: standalone
-      os: ubuntu1804
+      os: rhel8
       auth-and-ssl: kerberos
     display_name: "Kerberos Tests"
     tasks:
       - name: "test-kerberos"
 
-  - matrix_name: "fle-latest"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1]
-      topology: [replica-set, sharded-cluster]
-      mongodb-version: ['latest']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu2004
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-6.0"
+  - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
+      ruby: <%= sample_rubies %>
       topology: [replica-set, sharded-cluster]
-      mongodb-version: ['6.0']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu2004
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.4"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-3.1]
-      topology: standalone
-      mongodb-version: ['4.4']
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.2"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-2.5]
-      topology: [standalone, replica-set, sharded-cluster]
-      mongodb-version: ["4.2"]
-      os: ubuntu2004
-      fle: helper
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${topology} ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  - matrix_name: "fle-4.0"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [ruby-2.6]
-      topology: standalone
-      mongodb-version: ["4.0"]
-      os: ubuntu2004
-      fle: path
-      docker-distro: ubuntu1804
-    display_name: "FLE: ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-fle-via-docker"
-
-  # https://jira.mongodb.org/browse/RUBY-3217
-  - matrix_name: "fle-jruby"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: [jruby-9.2, jruby-9.3]
-      topology: standalone
-      mongodb-version: ['5.0']
-      os: ubuntu2004
+      mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
+      os: rhel8
       fle: helper
-      docker-distro: ubuntu2004
     display_name: "FLE: ${mongodb-version} ${ruby}"
     tasks:
-      - name: "test-fle-via-docker"
+      - name: "test-fle"
 
   - matrix_name: aws-auth-regular
     matrix_spec:
-      auth-and-ssl: aws-regular
-      ruby: [ruby-2.7]
+      auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
+      ruby: <%= latest_ruby %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu1804
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
     display_name: "AWS auth regular: ${mongodb-version} ${ruby}"
     tasks:
       - name: "test-aws-auth"
 
-  - matrix_name: aws-auth-temporary
-    matrix_spec:
-      auth-and-ssl: [aws-assume-role, aws-ec2, aws-ecs, aws-web-identity]
-      ruby: [ruby-3.1]
-      topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu1804
-    display_name: "AWS auth temporary: ${auth-and-ssl} ${mongodb-version} ${ruby}"
-    tasks:
-      - name: "test-aws-auth"
-
-  # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
-  # TODO Add ruby-3.0: RUBY-2717
-  <%|= standard_debian_rubies(%w(ruby-2.5 ruby-2.6 ruby-2.7), key: 'docker-distro') do %>
-    matrix_name: ocsp-verifier
+  - matrix_name: ocsp-verifier
     matrix_spec:
       ocsp-verifier: true
       # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
-      ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5]
+      ruby: <%= supported_mri_rubies %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
     display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
     tasks:
-      - name: test-via-docker
-  <%| end %>
+      - name: test-mlaunch
 
   - matrix_name: ocsp-must-staple
     matrix_spec:
       ocsp-algorithm: ecdsa
       ocsp-must-staple: on
       ocsp-delegate: on
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: <%= sample_mri_rubies %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
     tasks:
@@ -602,10 +365,10 @@ buildvariants:
     matrix_spec:
       ocsp-algorithm: rsa
       ocsp-status: unknown
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: <%= sample_mri_rubies %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
     tasks:
@@ -632,10 +395,10 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: <%= outcome %>
       extra-uri-options: "<%= extra_uri_options %>"
-      ruby: [ruby-3.0, ruby-2.7]
+      ruby: <%= sample_mri_rubies %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -653,43 +416,41 @@ buildvariants:
       ocsp-status: [valid, unknown]
       ocsp-delegate: '*'
       ocsp-connectivity: pass
-      ruby: jruby-9.2
+      ruby: <%= jrubies.first %>
       topology: standalone
-      mongodb-version: '4.4'
-      os: ubuntu2004
+      mongodb-version: <%= latest_stable_mdb %>
+      os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
 
   - matrix_name: testgcpkms-variant
     matrix_spec:
-      ruby: ruby-3.0
+      ruby: <%= latest_ruby %>
       fle: helper
       topology: standalone
-      os: debian11
-      mongodb-version: 6.0
+      os: rhel8
+      mongodb-version: <%= latest_stable_mdb %>
     display_name: "GCP KMS"
     tasks:
       - name: testgcpkms_task_group
         batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-  - matrix_name: "atlas"
+  - matrix_name: atlas
     matrix_spec:
-      ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.2"]
+      ruby: <%= supported_rubies %>
+      os: rhel8
     display_name: "Atlas tests ${ruby}"
-    run_on:
-      - ubuntu1804-small
     tasks:
        - name: test-atlas
 
   - matrix_name: "serverless"
     matrix_spec:
       # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "jruby-9.3"]
-      ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1"]
+      # ruby: <%= supported_rubies %>
+      ruby: <%= supported_mri_rubies %>
       fle: path
+      os: rhel8
     display_name: "Atlas serverless ${ruby} single mongos"
-    run_on:
-      - ubuntu2004-small
     tasks:
        - name: test-serverless
diff --git a/.evergreen/update-evergreen-configs b/.evergreen/update-evergreen-configs
index a57b4e5d16..b1f4296649 100755
--- a/.evergreen/update-evergreen-configs
+++ b/.evergreen/update-evergreen-configs
@@ -36,36 +36,6 @@ EOT
   def get_binding
     binding
   end
-
-  DEBIAN_FOR_RUBY = {
-    'ruby-2.3' => 'debian92',
-    'ruby-2.4' => 'debian92',
-    'ruby-2.5' => 'debian10',
-    'ruby-2.6' => 'debian10',
-    'ruby-2.7' => 'debian10',
-    'ruby-3.0' => 'debian10',
-  }
-
-  def standard_debian_rubies(rubies, key: nil, &block)
-    rubies.flatten!
-    text = block.call
-    contents = YAML.load(text)
-    out = rubies.map do |ruby|
-      contents.merge(
-        'matrix_name' => "#{contents['matrix_name']} - #{ruby}",
-        'matrix_spec' => contents['matrix_spec'].merge(
-          'ruby' => ruby,
-          key || 'os' => DEBIAN_FOR_RUBY.fetch(ruby),
-        ),
-      )
-    end.to_yaml
-    text =~ /\A\n?(\s+)/
-    unless text
-      raise "Couldn't figure out indentation level"
-    end
-    indent = ' ' * ($1.length - 2)
-    "\n" + out.sub(/\A---.*\n/, indent).gsub("\n", "\n#{indent}")
-  end
 end
 
 Runner.new.run
diff --git a/spec/shared b/spec/shared
index cf850dfb42..65e01397f5 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit cf850dfb42e64599f0bae78ea21316feb2fdc8dc
+Subproject commit 65e01397f5d297ae64700e7b9ec64197a26b8aa0
diff --git a/spec/solo/clean_exit_spec.rb b/spec/solo/clean_exit_spec.rb
index 1693b379e9..bff83f74ec 100644
--- a/spec/solo/clean_exit_spec.rb
+++ b/spec/solo/clean_exit_spec.rb
@@ -4,16 +4,8 @@
 require 'mongo'
 
 describe 'Clean exit' do
-
-  before(:all) do
-    unless %w(1 true yes).include?(ENV['SOLO'])
-      skip 'Set SOLO=1 in environment to run solo tests'
-    end
-
-    if %w(1 true yes).include?(ENV['EXTERNAL_DISABLED'])
-      skip "Test requires external connectivity"
-    end
-  end
+  require_external_connectivity
+  require_solo
 
   context 'with SRV URI' do
 

From e6f7488a0a5dd7e7061f1c9f87682a2f29bbef90 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Tue, 2 May 2023 09:23:06 -0600
Subject: [PATCH 02/41] fix config validation errors

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index d43037fd5a..7f43cb3735 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1004,10 +1004,10 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
-      mongodb-version: ['latest', '7.0', '6.0']
+      mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
@@ -1047,8 +1047,8 @@ buildvariants:
   - matrix_name: "single-lb"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ruby-3.2
-      mongodb-version: ['7.0', '6.0']
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: load-balanced
       single-mongos: single-mongos
       os: rhel8
@@ -1059,7 +1059,7 @@ buildvariants:
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ruby-3.2
+      ruby: "ruby-3.2"
       mongodb-version: '5.0'
       topology: standalone
       api-version-required: yes
@@ -1071,8 +1071,8 @@ buildvariants:
   - matrix_name: "single-mongos"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: "sharded-cluster"
       single-mongos: single-mongos
       os: rhel8
@@ -1083,8 +1083,8 @@ buildvariants:
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
@@ -1094,8 +1094,8 @@ buildvariants:
   - matrix_name: "no-retry-writes"
     matrix_spec:
       retry-writes: no-retry-writes
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: [replica-set, sharded-cluster]
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
@@ -1116,8 +1116,8 @@ buildvariants:
   - matrix_name: "lint"
     matrix_spec:
       lint: on
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: '*'
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
@@ -1127,8 +1127,8 @@ buildvariants:
   - matrix_name: "fork"
     matrix_spec:
       fork: on
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} fork ${ruby}"
@@ -1139,7 +1139,7 @@ buildvariants:
     matrix_spec:
       solo: on
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
-      mongodb-version: 
+      mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
@@ -1160,7 +1160,7 @@ buildvariants:
   - matrix_name: "stress"
     matrix_spec:
       stress: on
-      ruby: ruby-3.2
+      ruby: "ruby-3.2"
       mongodb-version: ["6.0", "5.3"]
       topology: replica-set
       os: rhel8
@@ -1171,7 +1171,7 @@ buildvariants:
   - matrix_name: "x509-tests"
     matrix_spec:
       auth-and-ssl: "x509"
-      ruby: ruby-3.2
+      ruby: "ruby-3.2"
       mongodb-version: ["6.0", "5.3"]
       topology: standalone
       os: rhel8
@@ -1183,7 +1183,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: "auth-and-ssl"
       ruby: jruby-9.4
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1194,7 +1194,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
       ruby: jruby-9.4
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1205,7 +1205,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zlib'
       os: rhel8
@@ -1217,7 +1217,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'snappy'
       os: rhel8
@@ -1229,7 +1229,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zstd'
       os: rhel8
@@ -1240,7 +1240,7 @@ buildvariants:
   - matrix_name: "activesupport"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: replica-set
       as: as
       os: rhel8
@@ -1251,10 +1251,10 @@ buildvariants:
   - matrix_name: "bson"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       topology: replica-set
       bson: "*"
-      os: rhel80
+      os: rhel8
     display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
     tasks:
       - name: "test-mlaunch"
@@ -1269,8 +1269,8 @@ buildvariants:
 
   - matrix_name: "kerberos-unit"
     matrix_spec:
-      ruby: ruby-3.2
-      mongodb-version: 6.0
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
       topology: standalone
       os: rhel8
       auth-and-ssl: kerberos
@@ -1286,18 +1286,18 @@ buildvariants:
       mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
       fle: helper
-    display_name: "FLE: ${mongodb-version} ${ruby}"
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-fle"
 
   - matrix_name: aws-auth-regular
     matrix_spec:
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
-      ruby: ruby-3.2
+      ruby: "ruby-3.2"
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
-    display_name: "AWS auth regular: ${mongodb-version} ${ruby}"
+    display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:
       - name: "test-aws-auth"
 
@@ -1307,7 +1307,7 @@ buildvariants:
       # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
     tasks:
@@ -1320,7 +1320,7 @@ buildvariants:
       ocsp-delegate: on
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
@@ -1333,7 +1333,7 @@ buildvariants:
       ocsp-status: unknown
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
@@ -1349,7 +1349,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1363,7 +1363,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1377,7 +1377,7 @@ buildvariants:
       extra-uri-options: "none"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1391,7 +1391,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1405,7 +1405,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1419,7 +1419,7 @@ buildvariants:
       extra-uri-options: "tlsInsecure=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1433,7 +1433,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1447,7 +1447,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1461,7 +1461,7 @@ buildvariants:
       extra-uri-options: "tlsAllowInvalidCertificates=true"
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
@@ -1481,7 +1481,7 @@ buildvariants:
       ocsp-connectivity: pass
       ruby: jruby-9.4
       topology: standalone
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
       os: rhel8
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
     tasks:
@@ -1489,11 +1489,11 @@ buildvariants:
 
   - matrix_name: testgcpkms-variant
     matrix_spec:
-      ruby: ruby-3.2
+      ruby: "ruby-3.2"
       fle: helper
       topology: standalone
       os: rhel8
-      mongodb-version: 6.0
+      mongodb-version: "6.0"
     display_name: "GCP KMS"
     tasks:
       - name: testgcpkms_task_group
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 61fdda0c6f..bd70faf899 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -3,7 +3,7 @@
 
   # latest_ruby = the most recently released, stable version of Ruby
   #    (make sure this version is being built by 10gen/mongo-ruby-toolchain)
-  latest_ruby = "ruby-3.2"
+  latest_ruby = "ruby-3.2".inspect # so it gets quoted as a string
 
   # these are used for testing against a few recent ruby versions
   recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.4 )
@@ -27,7 +27,7 @@
                      %w( jruby-9.4 jruby-9.3 jruby-9.2 )
 
   # The latest stable version of MongoDB
-  latest_stable_mdb = "6.0"
+  latest_stable_mdb = "6.0".inspect # so it gets quoted as a string
 
   # A few of the most recent MongoDB versions
   recent_mdb = %w( 6.0 5.3 )
@@ -38,10 +38,10 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= recent_rubies %>
-      mongodb-version: ['latest', '7.0', '6.0']
+      mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
       os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
@@ -82,7 +82,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
-      mongodb-version: ['7.0', '6.0']
+      mongodb-version: <%= latest_stable_mdb %>
       topology: load-balanced
       single-mongos: single-mongos
       os: rhel8
@@ -173,7 +173,7 @@ buildvariants:
     matrix_spec:
       solo: on
       ruby: <%= supported_rubies %>
-      mongodb-version: <% latest_stable_mdb %>
+      mongodb-version: <%= latest_stable_mdb %>
       topology: <%= topologies %>
       os: rhel8
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
@@ -288,7 +288,7 @@ buildvariants:
       mongodb-version: <%= latest_stable_mdb %>
       topology: replica-set
       bson: "*"
-      os: rhel80
+      os: rhel8
     display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
     tasks:
       - name: "test-mlaunch"
@@ -320,7 +320,7 @@ buildvariants:
       mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
       fle: helper
-    display_name: "FLE: ${mongodb-version} ${ruby}"
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-fle"
 
@@ -331,7 +331,7 @@ buildvariants:
       topology: standalone
       mongodb-version: <%= latest_stable_mdb %>
       os: rhel8
-    display_name: "AWS auth regular: ${mongodb-version} ${ruby}"
+    display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:
       - name: "test-aws-auth"
 

From 67084a03f42a51fae930caeb93f99275d65d7f0a Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Tue, 2 May 2023 09:30:10 -0600
Subject: [PATCH 03/41] don't try to run ruby 2.7 on ubuntu2204

---
 .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 7f43cb3735..1c802a573d 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1262,7 +1262,7 @@ buildvariants:
   - matrix_name: "kerberos-integration"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      os: [ ubuntu2204, rhel8 ]
+      os: rhel8
     display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
       - name: "test-kerberos-integration"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index bd70faf899..9c52f82a87 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -296,7 +296,7 @@ buildvariants:
   - matrix_name: "kerberos-integration"
     matrix_spec:
       ruby: <%= sample_rubies %>
-      os: [ ubuntu2204, rhel8 ]
+      os: rhel8
     display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
       - name: "test-kerberos-integration"

From c93f6b8ea624b35026fd2b36088dac2eb512986a Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 3 May 2023 07:55:57 -0600
Subject: [PATCH 04/41] bump submodule to get updated toolchain version

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index 65e01397f5..615dc5301d 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 65e01397f5d297ae64700e7b9ec64197a26b8aa0
+Subproject commit 615dc5301d3bdc5911542f3a79b0b4d36b4f644a

From f88fa933d093352354f81051dc784c91f8eb3513 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 3 May 2023 08:37:27 -0600
Subject: [PATCH 05/41] rhel84 -> rhel80

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 1c802a573d..9f2d7af188 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -789,7 +789,7 @@ axes:
         run_on: ubuntu2204-arm64-small
       - id: rhel8
         display_name: "RHEL 8"
-        run_on: rhel84-small
+        run_on: rhel80-small
       - id: rhel8-arm
         display_name: "RHEL 8 ARM64"
         run_on: rhel82-arm64-small
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index 5180c97c5c..24866c407d 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -197,7 +197,7 @@ axes:
         run_on: ubuntu2204-arm64-small
       - id: rhel8
         display_name: "RHEL 8"
-        run_on: rhel84-small
+        run_on: rhel80-small
       - id: rhel8-arm
         display_name: "RHEL 8 ARM64"
         run_on: rhel82-arm64-small

From b9b1a4dffc49acb1b9cd2b114f565cb2013f1bf0 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 3 May 2023 11:54:59 -0600
Subject: [PATCH 06/41] keep tweaking

---
 .evergreen/config.yml              | 38 +++++++++++-------------------
 .evergreen/config/axes.yml.erb     |  5 +---
 .evergreen/config/standard.yml.erb | 33 ++++++++++----------------
 spec/solo/clean_exit_spec.rb       |  1 +
 4 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 9f2d7af188..e40f855dcf 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -784,9 +784,6 @@ axes:
       - id: ubuntu2204
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
-      - id: ubuntu2204-arm
-        display_name: "Ubuntu 22.04 ARM64"
-        run_on: ubuntu2204-arm64-small
       - id: rhel8
         display_name: "RHEL 8"
         run_on: rhel80-small
@@ -899,7 +896,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1604-small
+        run_on: rhel80-small
         variables:
           MMAPV1: 'true'
 
@@ -1000,20 +997,29 @@ axes:
         display_name: No
 
 buildvariants:
-  - matrix_name: "mongo-recent"
+  - matrix_name: "auth/ssl"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
+      ruby: "ruby-3.2"
+      mongodb-version: "6.0"
+      topology: ["standalone", "replica-set", "sharded-cluster"]
+      os: rhel8
+    display_name: ${auth-and-ssl} ${topology}
+    tasks:
+      - name: "test-mlaunch"
+
+  - matrix_name: "mongo-recent"
+    matrix_spec:
       ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
+      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: ['5.3', '5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
@@ -1024,7 +1030,6 @@ buildvariants:
   
   - matrix_name: "mongo-4.x"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       mongodb-version: ['4.4', '4.2', '4.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
@@ -1035,7 +1040,6 @@ buildvariants:
   
   - matrix_name: "mongo-3.6"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-2.5"
       mongodb-version: ['3.6']
       topology: ["standalone", "replica-set", "sharded-cluster"]
@@ -1046,7 +1050,6 @@ buildvariants:
 
   - matrix_name: "single-lb"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.2"
       mongodb-version: "6.0"
       topology: load-balanced
@@ -1058,7 +1061,6 @@ buildvariants:
 
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.2"
       mongodb-version: '5.0'
       topology: standalone
@@ -1070,7 +1072,6 @@ buildvariants:
 
   - matrix_name: "single-mongos"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.2"
       mongodb-version: "6.0"
       topology: "sharded-cluster"
@@ -1181,18 +1182,7 @@ buildvariants:
 
   - matrix_name: "jruby-auth"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: jruby-9.4
-      mongodb-version: "6.0"
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: rhel8
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "jruby-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: jruby-9.4
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
index 24866c407d..431da45a63 100644
--- a/.evergreen/config/axes.yml.erb
+++ b/.evergreen/config/axes.yml.erb
@@ -192,9 +192,6 @@ axes:
       - id: ubuntu2204
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
-      - id: ubuntu2204-arm
-        display_name: "Ubuntu 22.04 ARM64"
-        run_on: ubuntu2204-arm64-small
       - id: rhel8
         display_name: "RHEL 8"
         run_on: rhel80-small
@@ -305,7 +302,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1604-small
+        run_on: rhel80-small
         variables:
           MMAPV1: 'true'
 
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 9c52f82a87..459a2ffc10 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -34,20 +34,29 @@
 %>
 
 buildvariants:
-  - matrix_name: "mongo-recent"
+  - matrix_name: "auth/ssl"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
+      ruby: <%= latest_ruby %>
+      mongodb-version: <%= latest_stable_mdb %>
+      topology: <%= topologies %>
+      os: rhel8
+    display_name: ${auth-and-ssl} ${topology}
+    tasks:
+      - name: "test-mlaunch"
+
+  - matrix_name: "mongo-recent"
+    matrix_spec:
       ruby: <%= recent_rubies %>
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
-      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204', 'ubuntu2204-arm']
+      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= sample_rubies %>
       mongodb-version: ['5.3', '5.0']
       topology: <%= topologies %>
@@ -58,7 +67,6 @@ buildvariants:
   
   - matrix_name: "mongo-4.x"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= older_rubies %>
       mongodb-version: ['4.4', '4.2', '4.0']
       topology: <%= topologies %>
@@ -69,7 +77,6 @@ buildvariants:
   
   - matrix_name: "mongo-3.6"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-2.5"
       mongodb-version: ['3.6']
       topology: <%= topologies %>
@@ -80,7 +87,6 @@ buildvariants:
 
   - matrix_name: "single-lb"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
       mongodb-version: <%= latest_stable_mdb %>
       topology: load-balanced
@@ -92,7 +98,6 @@ buildvariants:
 
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
       mongodb-version: '5.0'
       topology: standalone
@@ -104,7 +109,6 @@ buildvariants:
 
   - matrix_name: "single-mongos"
     matrix_spec:
-      auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
       mongodb-version: <%= latest_stable_mdb %>
       topology: "sharded-cluster"
@@ -215,18 +219,7 @@ buildvariants:
 
   - matrix_name: "jruby-auth"
     matrix_spec:
-      auth-and-ssl: "auth-and-ssl"
-      ruby: <%= jrubies.first %>
-      mongodb-version: <%= latest_stable_mdb %>
-      topology: <%= topologies %>
-      os: rhel8
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "jruby-noauth"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
+      auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
       ruby: <%= jrubies.first %>
       mongodb-version: <%= latest_stable_mdb %>
       topology: <%= topologies %>
diff --git a/spec/solo/clean_exit_spec.rb b/spec/solo/clean_exit_spec.rb
index bff83f74ec..80e80fd030 100644
--- a/spec/solo/clean_exit_spec.rb
+++ b/spec/solo/clean_exit_spec.rb
@@ -2,6 +2,7 @@
 # rubocop:todo all
 
 require 'mongo'
+require 'lite_spec_helper'
 
 describe 'Clean exit' do
   require_external_connectivity

From 011c74ac62dadd00e5e9dc02ccc479bd7ede132d Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 3 May 2023 11:57:41 -0600
Subject: [PATCH 07/41] add "require_solo" helper

---
 spec/lite_spec_helper.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/lite_spec_helper.rb b/spec/lite_spec_helper.rb
index 22a98d7b8c..0394b97f3b 100644
--- a/spec/lite_spec_helper.rb
+++ b/spec/lite_spec_helper.rb
@@ -110,6 +110,15 @@ class ExampleTimeout < StandardError; end
   config.include(MongosMacros)
   config.extend(Mongo::Macros)
 
+  # Used for spec/solo/*
+  def require_solo
+    before(:all) do
+      unless %w(1 true yes).include?(ENV['SOLO'])
+        skip 'Set SOLO=1 in environment to run solo tests'
+      end
+    end
+  end
+
   if SpecConfig.instance.ci?
     SdamFormatterIntegration.subscribe
     config.add_formatter(JsonExtFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))

From 14ffa222cd4e8be9ed61fee27285437cb5142918 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 08:11:39 -0600
Subject: [PATCH 08/41] for testing: pointing spec/shared at my own branch

---
 .gitmodules | 3 ++-
 spec/shared | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 366d171c3a..8303869258 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,5 @@
 	url = https://github.com/mongodb-labs/drivers-evergreen-tools
 [submodule "spec/shared"]
 	path = spec/shared
-	url = https://github.com/mongodb-labs/mongo-ruby-spec-shared
+	url = git@github.com:jamis/mongo-ruby-spec-shared.git
+	branch = ruby-3232-debian-needs-ensurepip
diff --git a/spec/shared b/spec/shared
index 615dc5301d..9cd90b8434 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 615dc5301d3bdc5911542f3a79b0b4d36b4f644a
+Subproject commit 9cd90b84340956ed73dcf26d34f01b62cbb254f6

From cdac79884a1d5b882f861f176f85fe927ded2022 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 08:16:43 -0600
Subject: [PATCH 09/41] update spec/shared again to fix typo

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index 9cd90b8434..83a56f3888 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 9cd90b84340956ed73dcf26d34f01b62cbb254f6
+Subproject commit 83a56f3888d86b77fbcd4eaef561de493542f82b

From c90cdeae11b8947957a3a79c46a2b0592ce967cb Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 08:23:52 -0600
Subject: [PATCH 10/41] bump spec/shared version again to prevent apt-get
 install from prompting

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index 83a56f3888..e3105c730b 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 83a56f3888d86b77fbcd4eaef561de493542f82b
+Subproject commit e3105c730b208b8cd40f48693b8682b5882c7d30

From 6b290914e559545f8597c0c63f8c22a28818cdc9 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 10:03:19 -0600
Subject: [PATCH 11/41] make sure cmake is installed for FLE runs

---
 .evergreen/run-tests.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 193fa92e3c..f98b610f14 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -163,6 +163,17 @@ elif test "$AUTH" = kerberos; then
 fi
 
 if test -n "$FLE"; then
+  # Make sure cmake is installed (in case we need to install the libmongocrypt
+  # helper)
+  if ! command -v cmake &> /dev/null; then
+    if ! command -v apt-get &> /dev/null; then
+      # no apt-get; assume RHEL
+      sudo yum -y install cmake libarchive
+    else
+      sudo apt-get install --yes cmake
+    fi
+  fi
+
   # Downloading crypt shared lib
   if [ -z "$MONGO_CRYPT_SHARED_DOWNLOAD_URL" ]; then
     crypt_shared_version=${CRYPT_SHARED_VERSION:-$("${BINDIR}"/mongod --version | grep -oP 'db version v\K.*')}

From eb5c86e8328f8a42796a29f6205379ffaeed7892 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 11:11:22 -0600
Subject: [PATCH 12/41] don't test on 3.2 yet (broken tests)

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index e40f855dcf..75c3a74a22 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1000,7 +1000,7 @@ buildvariants:
   - matrix_name: "auth/ssl"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1010,7 +1010,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
+      ruby: ["ruby-3.1", "jruby-9.4"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
@@ -1020,7 +1020,7 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: ['5.3', '5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1050,7 +1050,7 @@ buildvariants:
 
   - matrix_name: "single-lb"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: load-balanced
       single-mongos: single-mongos
@@ -1061,7 +1061,7 @@ buildvariants:
 
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: '5.0'
       topology: standalone
       api-version-required: yes
@@ -1072,7 +1072,7 @@ buildvariants:
 
   - matrix_name: "single-mongos"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: "sharded-cluster"
       single-mongos: single-mongos
@@ -1084,7 +1084,7 @@ buildvariants:
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1095,7 +1095,7 @@ buildvariants:
   - matrix_name: "no-retry-writes"
     matrix_spec:
       retry-writes: no-retry-writes
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: [replica-set, sharded-cluster]
       os: rhel8
@@ -1117,7 +1117,7 @@ buildvariants:
   - matrix_name: "lint"
     matrix_spec:
       lint: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: '*'
       os: rhel8
@@ -1128,7 +1128,7 @@ buildvariants:
   - matrix_name: "fork"
     matrix_spec:
       fork: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1161,7 +1161,7 @@ buildvariants:
   - matrix_name: "stress"
     matrix_spec:
       stress: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: ["6.0", "5.3"]
       topology: replica-set
       os: rhel8
@@ -1172,7 +1172,7 @@ buildvariants:
   - matrix_name: "x509-tests"
     matrix_spec:
       auth-and-ssl: "x509"
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: ["6.0", "5.3"]
       topology: standalone
       os: rhel8
@@ -1194,7 +1194,7 @@ buildvariants:
   - matrix_name: "zlib"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zlib'
@@ -1206,7 +1206,7 @@ buildvariants:
   - matrix_name: "snappy"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'snappy'
@@ -1218,7 +1218,7 @@ buildvariants:
   - matrix_name: "zstd-auth"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zstd'
@@ -1229,7 +1229,7 @@ buildvariants:
 
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "6.0"
       topology: replica-set
       as: as
@@ -1240,7 +1240,7 @@ buildvariants:
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "6.0"
       topology: replica-set
       bson: "*"
@@ -1251,7 +1251,7 @@ buildvariants:
 
   - matrix_name: "kerberos-integration"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       os: rhel8
     display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
@@ -1259,7 +1259,7 @@ buildvariants:
 
   - matrix_name: "kerberos-unit"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       mongodb-version: "6.0"
       topology: standalone
       os: rhel8
@@ -1271,7 +1271,7 @@ buildvariants:
   - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
       topology: [replica-set, sharded-cluster]
       mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
@@ -1283,7 +1283,7 @@ buildvariants:
   - matrix_name: aws-auth-regular
     matrix_spec:
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1308,7 +1308,7 @@ buildvariants:
       ocsp-algorithm: ecdsa
       ocsp-must-staple: on
       ocsp-delegate: on
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1321,7 +1321,7 @@ buildvariants:
     matrix_spec:
       ocsp-algorithm: rsa
       ocsp-status: unknown
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1337,7 +1337,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1351,7 +1351,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1365,7 +1365,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: fail
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1379,7 +1379,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1393,7 +1393,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1407,7 +1407,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1421,7 +1421,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1435,7 +1435,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1449,7 +1449,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1479,7 +1479,7 @@ buildvariants:
 
   - matrix_name: testgcpkms-variant
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.1"
       fle: helper
       topology: standalone
       os: rhel8
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 459a2ffc10..1b0818d1bb 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -1,15 +1,21 @@
 <%
   topologies = %w( standalone replica-set sharded-cluster )
 
+  # ruby-3.2 is available in the toolchain, but tests break. It will
+  # require some investigation. Once available:
+  #   1. set latest_ruby to ruby-3.2
+  #   2. add ruby-3.2 to recent_rubies
+  #   3. replace ruby-3.1 with ruby-3.2 in sample_mri_rubies.
+
   # latest_ruby = the most recently released, stable version of Ruby
   #    (make sure this version is being built by 10gen/mongo-ruby-toolchain)
-  latest_ruby = "ruby-3.2".inspect # so it gets quoted as a string
+  latest_ruby = "ruby-3.1".inspect # so it gets quoted as a string
 
   # these are used for testing against a few recent ruby versions
-  recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.4 )
+  recent_rubies = %w( ruby-3.1 jruby-9.4 )
 
   # this is a list of the most most recent 3.x and 2.x MRI ruby versions
-  sample_mri_rubies = %w( ruby-3.2 ruby-2.7 )
+  sample_mri_rubies = %w( ruby-3.1 ruby-2.7 )
 
   # as above, but including the most recent JRuby release
   sample_rubies = sample_mri_rubies + %w( jruby-9.4 )

From 9f93b3fe7402d63fa50655a2f1a0742ae1f835b3 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 12:05:12 -0600
Subject: [PATCH 13/41] make sure we check for cmake BEFORE the bundle is
 installed

---
 .evergreen/run-tests.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index f98b610f14..a0957e7449 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -47,6 +47,21 @@ if test "$DOCKER_PRELOAD" != 1; then
   install_mlaunch_venv
 fi
 
+# Make sure cmake is installed (in case we need to install the libmongocrypt
+# helper)
+if test -n "$FLE"; then
+  if ! command -v cmake &> /dev/null; then
+    if ! command -v apt-get &> /dev/null; then
+      # no apt-get; assume RHEL
+      sudo yum -y install cmake libarchive
+    else
+      sudo apt-get install --yes cmake
+    fi
+  else
+    echo 'cmake is present'
+  fi
+fi
+
 # Launching mongod under $MONGO_ORCHESTRATION_HOME
 # makes its log available through log collecting machinery
 
@@ -163,17 +178,6 @@ elif test "$AUTH" = kerberos; then
 fi
 
 if test -n "$FLE"; then
-  # Make sure cmake is installed (in case we need to install the libmongocrypt
-  # helper)
-  if ! command -v cmake &> /dev/null; then
-    if ! command -v apt-get &> /dev/null; then
-      # no apt-get; assume RHEL
-      sudo yum -y install cmake libarchive
-    else
-      sudo apt-get install --yes cmake
-    fi
-  fi
-
   # Downloading crypt shared lib
   if [ -z "$MONGO_CRYPT_SHARED_DOWNLOAD_URL" ]; then
     crypt_shared_version=${CRYPT_SHARED_VERSION:-$("${BINDIR}"/mongod --version | grep -oP 'db version v\K.*')}

From fc65cd299962c662b8c73154cb0f819975feadda Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 4 May 2023 16:42:46 -0600
Subject: [PATCH 14/41] use MDB 5.x for testing certain auth mechanisms

this is because run-tests.sh uses `mongo` to configure the MDB instance for
certain auth mechanisms, which isn't shipped in MDB 6+.
---
 .evergreen/config.yml              | 7 ++++++-
 .evergreen/config/standard.yml.erb | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 75c3a74a22..e9fad912ab 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1285,7 +1285,12 @@ buildvariants:
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
       ruby: "ruby-3.1"
       topology: standalone
-      mongodb-version: "6.0"
+      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+      # the server for certain auth mechanisms. Once run-tests.sh is made smart
+      # enough to install mongosh, and then use either mongo or mongosh
+      # (depending on server version and what's available), we can bump this to
+      # the latest stable db version.
+      mongodb-version: "5.3"
       os: rhel8
     display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 1b0818d1bb..6c853b9ccf 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -37,6 +37,7 @@
 
   # A few of the most recent MongoDB versions
   recent_mdb = %w( 6.0 5.3 )
+  latest_5x_mdb = "5.3".inspect # so it gets quoted as a string
 %>
 
 buildvariants:
@@ -328,7 +329,12 @@ buildvariants:
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
       ruby: <%= latest_ruby %>
       topology: standalone
-      mongodb-version: <%= latest_stable_mdb %>
+      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+      # the server for certain auth mechanisms. Once run-tests.sh is made smart
+      # enough to install mongosh, and then use either mongo or mongosh
+      # (depending on server version and what's available), we can bump this to
+      # the latest stable db version.
+      mongodb-version: <%= latest_5x_mdb %>
       os: rhel8
     display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:

From fb22de683ec2be9ffd2e15f90364c0184425fb92 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 09:51:22 -0600
Subject: [PATCH 15/41] try building the native extension for mongo_kerberos

---
 .evergreen/run-tests-kerberos-integration.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.evergreen/run-tests-kerberos-integration.sh b/.evergreen/run-tests-kerberos-integration.sh
index 3d9eb49e73..63e59211d2 100755
--- a/.evergreen/run-tests-kerberos-integration.sh
+++ b/.evergreen/run-tests-kerberos-integration.sh
@@ -61,6 +61,14 @@ configure_kerberos_ip_addr
 echo "Install dependencies"
 export BUNDLE_GEMFILE=gemfiles/mongo_kerberos.gemfile
 bundle_install
+
+# need to build the native extension, since it doesn't seem to build correctly
+# when installed via github.
+curdir=`pwd`
+cd `bundle info --path mongo_kerberos`
+rake compile
+cd $curdir
+
 bundle list
 
 export MONGO_RUBY_DRIVER_KERBEROS=1

From ea4ce940d2b80accdce0aa0ef362946702680cab Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 13:50:13 -0600
Subject: [PATCH 16/41] remove jruby-9.4 for now to see if things pass any
 better with 9.3

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index e9fad912ab..171216061f 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1010,7 +1010,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      ruby: ["ruby-3.1", "jruby-9.4"]
+      ruby: ["ruby-3.1", "jruby-9.3"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
@@ -1139,7 +1139,7 @@ buildvariants:
   - matrix_name: "solo"
     matrix_spec:
       solo: on
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1183,7 +1183,7 @@ buildvariants:
   - matrix_name: "jruby-auth"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: jruby-9.4
+      ruby: jruby-9.3
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1474,7 +1474,7 @@ buildvariants:
       ocsp-status: [valid, unknown]
       ocsp-delegate: '*'
       ocsp-connectivity: pass
-      ruby: jruby-9.4
+      ruby: jruby-9.3
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1496,7 +1496,7 @@ buildvariants:
 
   - matrix_name: atlas
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
       os: rhel8
     display_name: "Atlas tests ${ruby}"
     tasks:
@@ -1505,7 +1505,7 @@ buildvariants:
   - matrix_name: "serverless"
     matrix_spec:
       # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.4", "jruby-9.3", "jruby-9.2"]
+      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       fle: path
       os: rhel8
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 6c853b9ccf..284b4ba61b 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -3,16 +3,22 @@
 
   # ruby-3.2 is available in the toolchain, but tests break. It will
   # require some investigation. Once available:
-  #   1. set latest_ruby to ruby-3.2
-  #   2. add ruby-3.2 to recent_rubies
-  #   3. replace ruby-3.1 with ruby-3.2 in sample_mri_rubies.
+  #   1. set `latest_ruby` to ruby-3.2
+  #   2. add ruby-3.2 to `recent_rubies`
+  #   3. replace ruby-3.1 with ruby-3.2 in `sample_mri_rubies`.
+
+  # jruby-9.4 is available in the toolchain, but tests break. It will
+  # require some investigation. Once available:
+  #  1. replace jruby-9.3 with jruby-9.4 in `recent_rubies` and
+  #     `sample_rubies`.
+  #  2. add jruby-9.4 to the front of `jrubies`.
 
   # latest_ruby = the most recently released, stable version of Ruby
   #    (make sure this version is being built by 10gen/mongo-ruby-toolchain)
   latest_ruby = "ruby-3.1".inspect # so it gets quoted as a string
 
   # these are used for testing against a few recent ruby versions
-  recent_rubies = %w( ruby-3.1 jruby-9.4 )
+  recent_rubies = %w( ruby-3.1 jruby-9.3 )
 
   # this is a list of the most most recent 3.x and 2.x MRI ruby versions
   sample_mri_rubies = %w( ruby-3.1 ruby-2.7 )
@@ -24,13 +30,12 @@
   older_rubies = %w( ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 )
 
   # all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
-  jrubies = %w( jruby-9.4 jruby-9.3 jruby-9.2 )
+  jrubies = %w( jruby-9.3 jruby-9.2 )
 
   supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
                              ruby-2.7 ruby-2.6 ruby-2.5 )
   
-  supported_rubies = supported_mri_rubies +
-                     %w( jruby-9.4 jruby-9.3 jruby-9.2 )
+  supported_rubies = supported_mri_rubies + jrubies
 
   # The latest stable version of MongoDB
   latest_stable_mdb = "6.0".inspect # so it gets quoted as a string

From d53a952cf73b7d297e5ab26b648c98c2f1447d71 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 14:13:54 -0600
Subject: [PATCH 17/41] bump spec/shared to get updated server registry (for
 aarch64 versions)

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index e3105c730b..26afdf88c1 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit e3105c730b208b8cd40f48693b8682b5882c7d30
+Subproject commit 26afdf88c1f5824ba51eb5d404fbe4a7aa21ffb9

From 1304050dd0db96a8fa8f695904f149df76514eb9 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 14:32:26 -0600
Subject: [PATCH 18/41] update serverless to use rhel80

---
 .evergreen/run-tests-serverless.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh
index b438d6ca6e..c51c73f054 100755
--- a/.evergreen/run-tests-serverless.sh
+++ b/.evergreen/run-tests-serverless.sh
@@ -26,12 +26,18 @@ else
     exit -1
 fi
 
+if ! ( grep -q ^ID.*rhel /etc/os_release & grep -q ^VERSION_ID.*8.0 /etc/os_release ); then
+    echo Serverless tests assume rhel80
+    echo If this has changed, update .evergreen/run-tests-serverless.sh as necessary
+    exit -1
+fi
+
 mkdir libmongocrypt
 cd libmongocrypt
 curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
 tar xf libmongocrypt-all.tar.gz
-# We assume that serverless tests are always use ubuntu2004
-export LIBMONGOCRYPT_PATH=`pwd`/ubuntu2004-64/nocrypto/lib/libmongocrypt.so
+# We assume that serverless tests always use rhel80
+export LIBMONGOCRYPT_PATH=`pwd`/rhel-80-64-bit/nocrypto/lib64/libmongocrypt.so
 cd -
 
 cd .evergreen/csfle

From 5ee62d7e2c4d7aad51e65fe7ee2c376246bf10b8 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 14:37:11 -0600
Subject: [PATCH 19/41] move the install_cmake function to spec/shared, and
 make sure it gets called in run-tests-gcp

---
 .evergreen/run-tests-gcp.sh |  5 +++++
 .evergreen/run-tests.sh     | 11 +----------
 spec/shared                 |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.evergreen/run-tests-gcp.sh b/.evergreen/run-tests-gcp.sh
index 32032fbeff..f27c3c454a 100755
--- a/.evergreen/run-tests-gcp.sh
+++ b/.evergreen/run-tests-gcp.sh
@@ -4,12 +4,17 @@ set -ex
 
 . `dirname "$0"`/../spec/shared/shlib/distro.sh
 . `dirname "$0"`/../spec/shared/shlib/set_env.sh
+. `dirname "$0"`/../spec/shared/shlib/server.sh
 . `dirname "$0"`/functions.sh
 
 set_env_vars
 set_env_python
 set_env_ruby
 
+if test -n "$FLE"; then
+  install_cmake
+fi
+
 sudo apt-get -y install libyaml-dev
 
 bundle_install
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index a0957e7449..0bd4ecbce4 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -50,16 +50,7 @@ fi
 # Make sure cmake is installed (in case we need to install the libmongocrypt
 # helper)
 if test -n "$FLE"; then
-  if ! command -v cmake &> /dev/null; then
-    if ! command -v apt-get &> /dev/null; then
-      # no apt-get; assume RHEL
-      sudo yum -y install cmake libarchive
-    else
-      sudo apt-get install --yes cmake
-    fi
-  else
-    echo 'cmake is present'
-  fi
+  install_cmake
 fi
 
 # Launching mongod under $MONGO_ORCHESTRATION_HOME
diff --git a/spec/shared b/spec/shared
index 26afdf88c1..aacfcb4c6c 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 26afdf88c1f5824ba51eb5d404fbe4a7aa21ffb9
+Subproject commit aacfcb4c6cfdff5e81a94835051f768107075fbd

From 203873a9109efcc036eefc7d1b99f8852b6db45b Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 14:43:28 -0600
Subject: [PATCH 20/41] don't run zstd tests on jruby (no support)

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 171216061f..c9c310a8b9 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1173,7 +1173,12 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: "x509"
       ruby: "ruby-3.1"
-      mongodb-version: ["6.0", "5.3"]
+      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+      # the server for certain auth mechanisms. Once run-tests.sh is made smart
+      # enough to install mongosh, and then use either mongo or mongosh
+      # (depending on server version and what's available), we can bump this to
+      # the latest stable db version.
+      mongodb-version: "5.3"
       topology: standalone
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1215,10 +1220,14 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  # the zstd-ruby gem does not support JRuby (explicitly). However, there is
+  # apparently a zstd-jni gem for JRuby that we could investigate here; if
+  # this test is ever supported to support jruby, the `sample_mri_rubies`
+  # reference should be replaced with `sample_rubies`.
   - matrix_name: "zstd-auth"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zstd'
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 284b4ba61b..d11bc02c70 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -222,7 +222,12 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: "x509"
       ruby: <%= latest_ruby %>
-      mongodb-version: <%= recent_mdb %>
+      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+      # the server for certain auth mechanisms. Once run-tests.sh is made smart
+      # enough to install mongosh, and then use either mongo or mongosh
+      # (depending on server version and what's available), we can bump this to
+      # the latest stable db version.
+      mongodb-version: <%= latest_5x_mdb %>
       topology: standalone
       os: rhel8
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -264,10 +269,14 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  # the zstd-ruby gem does not support JRuby (explicitly). However, there is
+  # apparently a zstd-jni gem for JRuby that we could investigate here; if
+  # this test is ever supported to support jruby, the `sample_mri_rubies`
+  # reference should be replaced with `sample_rubies`.
   - matrix_name: "zstd-auth"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: <%= sample_rubies %>
+      ruby: <%= sample_mri_rubies %>
       mongodb-version: <%= latest_stable_mdb %>
       topology: "replica-set"
       compressor: 'zstd'

From 1189d515194c4760786b679a38eb60ef0f11e117 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:01:05 -0600
Subject: [PATCH 21/41] bump spec/shared to get updated target arch selection

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index aacfcb4c6c..7277576c15 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit aacfcb4c6cfdff5e81a94835051f768107075fbd
+Subproject commit 7277576c153dde2f7e181b70b96a02f2c49e2e0c

From 7eaaf6c6341038df6f44ab0fee1bb4c4090a5e6e Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:02:07 -0600
Subject: [PATCH 22/41] replace jruby 9.4 with 9.3 in sample_rubies list

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index c9c310a8b9..e5d883780f 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1020,7 +1020,7 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: ['5.3', '5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1199,7 +1199,7 @@ buildvariants:
   - matrix_name: "zlib"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'zlib'
@@ -1211,7 +1211,7 @@ buildvariants:
   - matrix_name: "snappy"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: "6.0"
       topology: "replica-set"
       compressor: 'snappy'
@@ -1238,7 +1238,7 @@ buildvariants:
 
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: "6.0"
       topology: replica-set
       as: as
@@ -1249,7 +1249,7 @@ buildvariants:
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: "6.0"
       topology: replica-set
       bson: "*"
@@ -1260,7 +1260,7 @@ buildvariants:
 
   - matrix_name: "kerberos-integration"
     matrix_spec:
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       os: rhel8
     display_name: "Kerberos integration ${os} ${ruby}"
     tasks:
@@ -1280,7 +1280,7 @@ buildvariants:
   - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       topology: [replica-set, sharded-cluster]
       mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index d11bc02c70..e65526ceb6 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -24,7 +24,7 @@
   sample_mri_rubies = %w( ruby-3.1 ruby-2.7 )
 
   # as above, but including the most recent JRuby release
-  sample_rubies = sample_mri_rubies + %w( jruby-9.4 )
+  sample_rubies = sample_mri_rubies + %w( jruby-9.3 )
 
   # older Ruby versions provided by 10gen/mongo-ruby-toolchain
   older_rubies = %w( ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 )

From d52db61ca73dc2f6d1c11fe2e99f7947a35efc51 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:19:24 -0600
Subject: [PATCH 23/41] bump spec/shared again

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index 7277576c15..fb27ec5b3d 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 7277576c153dde2f7e181b70b96a02f2c49e2e0c
+Subproject commit fb27ec5b3d103eea8d4f746cf8c3aae948eed39d

From a80832845dbe94212293b81360df381c67aa8fdc Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:24:32 -0600
Subject: [PATCH 24/41] make sure kerberos stuff doesn't get confused by the
 BUNDLE_GEMFILE variable

---
 .evergreen/run-tests-kerberos-integration.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.evergreen/run-tests-kerberos-integration.sh b/.evergreen/run-tests-kerberos-integration.sh
index 63e59211d2..45e1836981 100755
--- a/.evergreen/run-tests-kerberos-integration.sh
+++ b/.evergreen/run-tests-kerberos-integration.sh
@@ -66,8 +66,15 @@ bundle_install
 # when installed via github.
 curdir=`pwd`
 cd `bundle info --path mongo_kerberos`
+
+# unset the BUNDLE_GEMFILE variable so the mongo_kerberos rakefile doesn't
+# get confused by it...
+saved_gemfile=$BUNDLE_GEMFILE
+unset BUNDLE_GEMFILE
+
 rake compile
 cd $curdir
+export BUNDLE_GEMFILE=$saved_gemfile
 
 bundle list
 

From 110b5dcb57a3dcd4db85d7a143d44b51ba40e410 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:30:28 -0600
Subject: [PATCH 25/41] don't test jruby on arm for now

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index e5d883780f..2a88ddb6a1 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1013,12 +1013,25 @@ buildvariants:
       ruby: ["ruby-3.1", "jruby-9.3"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
+      os: ['rhel8', 'debian11', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "mongo-5.x"
+  # Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
+  # issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
+  # and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
+  - matrix_name: "mongo-recent-arm"
+    matrix_spec:
+      ruby: "ruby-3.1"
+      mongodb-version: ['latest', '6.0']
+      topology: ["standalone", "replica-set", "sharded-cluster"]
+      os: 'rhel8-arm'
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
+    tasks:
+      - name: "test-mlaunch"
+  
+    - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: ['5.3', '5.0']
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index e65526ceb6..fb334dd7b3 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -62,12 +62,25 @@ buildvariants:
       ruby: <%= recent_rubies %>
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
-      os: ['rhel8', 'rhel8-arm', 'debian11', 'ubuntu2204']
+      os: ['rhel8', 'debian11', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "mongo-5.x"
+  # Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
+  # issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
+  # and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
+  - matrix_name: "mongo-recent-arm"
+    matrix_spec:
+      ruby: <%= latest_ruby %>
+      mongodb-version: ['latest', '6.0']
+      topology: <%= topologies %>
+      os: 'rhel8-arm'
+    display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
+    tasks:
+      - name: "test-mlaunch"
+  
+    - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: <%= sample_rubies %>
       mongodb-version: ['5.3', '5.0']

From 0631fbf7e65d1b2ff0e1e4ab84a66f3c3e90967a Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:36:38 -0600
Subject: [PATCH 26/41] don't assume x86_64 architecture

---
 spec/support/shared/app_metadata.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/spec/support/shared/app_metadata.rb b/spec/support/shared/app_metadata.rb
index 390e847245..8f44ac78c7 100644
--- a/spec/support/shared/app_metadata.rb
+++ b/spec/support/shared/app_metadata.rb
@@ -1,6 +1,18 @@
 # frozen_string_literal: true
 # rubocop:todo all
 
+def target_arch
+  @target_arch ||= begin
+    uname = `uname -a`.strip
+    case uname
+    when /aarch/ then "aarch64"
+    when /x86/   then "x86_64"
+    when /arm/   then "arm64"
+    else raise "unrecognized architecture: #{uname.inspect}"
+    end
+  end
+end
+
 shared_examples 'app metadata document' do
   let(:app_metadata) do
     described_class.new({})
@@ -27,7 +39,7 @@
         # Ruby 2.7.3 uses linux.
         %w(linux linux-gnu).should include(document[:client][:os][:name])
       end
-      document[:client][:os][:architecture].should == 'x86_64'
+      document[:client][:os][:architecture].should == target_arch
     end
   end
 
@@ -45,7 +57,7 @@
       else
         document[:client][:os][:name].should =~ /darwin\d+/
       end
-      document[:client][:os][:architecture].should == 'x86_64'
+      document[:client][:os][:architecture].should == target_arch
     end
   end
 

From dfdf121447d426fc1e17f8b8725878a566955239 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 15:50:08 -0600
Subject: [PATCH 27/41] fix invalid config

---
 .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 2a88ddb6a1..87e2f0a229 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1031,7 +1031,7 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
   
-    - matrix_name: "mongo-5.x"
+  - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
       mongodb-version: ['5.3', '5.0']
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index fb334dd7b3..df8f41b498 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -80,7 +80,7 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
   
-    - matrix_name: "mongo-5.x"
+  - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: <%= sample_rubies %>
       mongodb-version: ['5.3', '5.0']

From 51f35cad176967ef1682b3ae12ecc69f8eb1613e Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 16:18:44 -0600
Subject: [PATCH 28/41] jruby-9.3 isn't being built for ubuntu/debian :/

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 87e2f0a229..c76fef659c 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1010,7 +1010,11 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      ruby: ["ruby-3.1", "jruby-9.3"]
+      # toolchain does not build jruby-9.3 for debian/ubuntu right now, only
+      # jruby-9.4. Until that changes (or until 9.4 doesn't fail tests), we
+      # only run mong-recent against latest ruby. Once fixed, replace
+      # `latest_ruby` with `recent_rubies`.
+      ruby: "ruby-3.1"
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'debian11', 'ubuntu2204']
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index df8f41b498..a8096b065f 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -59,7 +59,11 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      ruby: <%= recent_rubies %>
+      # toolchain does not build jruby-9.3 for debian/ubuntu right now, only
+      # jruby-9.4. Until that changes (or until 9.4 doesn't fail tests), we
+      # only run mong-recent against latest ruby. Once fixed, replace
+      # `latest_ruby` with `recent_rubies`.
+      ruby: <%= latest_ruby %>
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
       os: ['rhel8', 'debian11', 'ubuntu2204']

From f0c9edae50b27ccdb0819553f0e1435ef93b8354 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 5 May 2023 16:38:18 -0600
Subject: [PATCH 29/41] need to build the bundle for the kerberos gem before
 compiling it

---
 .evergreen/run-tests-kerberos-integration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/run-tests-kerberos-integration.sh b/.evergreen/run-tests-kerberos-integration.sh
index 45e1836981..e7002d898e 100755
--- a/.evergreen/run-tests-kerberos-integration.sh
+++ b/.evergreen/run-tests-kerberos-integration.sh
@@ -72,6 +72,7 @@ cd `bundle info --path mongo_kerberos`
 saved_gemfile=$BUNDLE_GEMFILE
 unset BUNDLE_GEMFILE
 
+bundle install
 rake compile
 cd $curdir
 export BUNDLE_GEMFILE=$saved_gemfile

From 515b8f338875348eebb6a0b9a3f80e306103612f Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 11 May 2023 16:58:24 +0200
Subject: [PATCH 30/41] bump spec/shared to latest from my branch

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index fb27ec5b3d..d6ed6a5135 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit fb27ec5b3d103eea8d4f746cf8c3aae948eed39d
+Subproject commit d6ed6a5135d776c4e6cc28636097affd9b7bf8cb

From ed4f176b4f06ed80bb238d72707a7fd8bf79193e Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 11 May 2023 17:20:57 +0200
Subject: [PATCH 31/41] jruby-9.3 is being built as a recent ruby now

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index c76fef659c..90cf51f0a4 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1010,11 +1010,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      # toolchain does not build jruby-9.3 for debian/ubuntu right now, only
-      # jruby-9.4. Until that changes (or until 9.4 doesn't fail tests), we
-      # only run mong-recent against latest ruby. Once fixed, replace
-      # `latest_ruby` with `recent_rubies`.
-      ruby: "ruby-3.1"
+      ruby: ["ruby-3.1", "jruby-9.3"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'debian11', 'ubuntu2204']
@@ -1034,7 +1030,7 @@ buildvariants:
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
@@ -1044,7 +1040,7 @@ buildvariants:
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-4.x"
     matrix_spec:
       ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
@@ -1054,7 +1050,7 @@ buildvariants:
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-3.6"
     matrix_spec:
       ruby: "ruby-2.5"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index a8096b065f..471c73635c 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -34,7 +34,7 @@
 
   supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
                              ruby-2.7 ruby-2.6 ruby-2.5 )
-  
+
   supported_rubies = supported_mri_rubies + jrubies
 
   # The latest stable version of MongoDB
@@ -59,11 +59,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      # toolchain does not build jruby-9.3 for debian/ubuntu right now, only
-      # jruby-9.4. Until that changes (or until 9.4 doesn't fail tests), we
-      # only run mong-recent against latest ruby. Once fixed, replace
-      # `latest_ruby` with `recent_rubies`.
-      ruby: <%= latest_ruby %>
+      ruby: <%= recent_rubies %>
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
       os: ['rhel8', 'debian11', 'ubuntu2204']
@@ -83,7 +79,7 @@ buildvariants:
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: <%= sample_rubies %>
@@ -93,7 +89,7 @@ buildvariants:
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-4.x"
     matrix_spec:
       ruby: <%= older_rubies %>
@@ -103,7 +99,7 @@ buildvariants:
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
-  
+
   - matrix_name: "mongo-3.6"
     matrix_spec:
       ruby: "ruby-2.5"

From e9b97335f3ff2453ca7132ca56175e332499d49e Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 12 May 2023 11:33:38 +0200
Subject: [PATCH 32/41] don't include ruby-3.2 in supported rubies (yet)

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

diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 471c73635c..257e7c4642 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -4,7 +4,7 @@
   # ruby-3.2 is available in the toolchain, but tests break. It will
   # require some investigation. Once available:
   #   1. set `latest_ruby` to ruby-3.2
-  #   2. add ruby-3.2 to `recent_rubies`
+  #   2. add ruby-3.2 to `recent_rubies` and `supported_mri_rubies`
   #   3. replace ruby-3.1 with ruby-3.2 in `sample_mri_rubies`.
 
   # jruby-9.4 is available in the toolchain, but tests break. It will
@@ -32,7 +32,7 @@
   # all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
   jrubies = %w( jruby-9.3 jruby-9.2 )
 
-  supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
+  supported_mri_rubies = %w( ruby-3.1 ruby-3.0
                              ruby-2.7 ruby-2.6 ruby-2.5 )
 
   supported_rubies = supported_mri_rubies + jrubies

From 83093e5495369a185a59ce906ef996ab0aade24b Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 12 May 2023 13:14:10 +0200
Subject: [PATCH 33/41] rebuild config.yml

---
 .evergreen/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 71133d9e31..f9a18debfd 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -832,7 +832,7 @@ axes:
         display_name: jruby-9.4
         variables:
           RVM_RUBY: "jruby-9.4"
-
+  
   - id: "os"
     display_name: OS
     values:
@@ -1210,7 +1210,7 @@ buildvariants:
   - matrix_name: "solo"
     matrix_spec:
       solo: on
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1380,7 +1380,7 @@ buildvariants:
     matrix_spec:
       ocsp-verifier: true
       # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
+      ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       topology: standalone
       mongodb-version: "6.0"
       os: rhel8
@@ -1579,7 +1579,7 @@ buildvariants:
       ruby: ruby-3.0
       fle: helper
       topology: standalone
-      os: debian11
+      os: debian11 # could eventually look at updating this to rhel80
       mongodb-version: 6.0
     display_name: "AZURE KMS"
     tasks:
@@ -1588,7 +1588,7 @@ buildvariants:
 
   - matrix_name: "atlas"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
       os: rhel8
     display_name: "Atlas tests ${ruby}"
     tasks:
@@ -1597,8 +1597,8 @@ buildvariants:
   - matrix_name: "serverless"
     matrix_spec:
       # https://jira.mongodb.org/browse/RUBY-3217
-      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
+      # ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
+      ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
       fle: path
       os: rhel8
     display_name: "Atlas serverless ${ruby} single mongos"

From 3cc8d2731d240e83f1426834d66b247273b7e53c Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Fri, 19 May 2023 09:02:00 -0600
Subject: [PATCH 34/41] bump spec/shared

---
 spec/shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/shared b/spec/shared
index d6ed6a5135..6a64d174d9 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit d6ed6a5135d776c4e6cc28636097affd9b7bf8cb
+Subproject commit 6a64d174d944d8f8eeb19296f43feacc3550d84b

From 62efeba973ec91dd05b5b86bde0bc4f6fb4efb9b Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 24 May 2023 10:14:36 -0600
Subject: [PATCH 35/41] leaving out debian11 for now; we have ubuntu2204, which
 is closely related

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index f9a18debfd..c6fcfaa8a9 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1062,7 +1062,7 @@ buildvariants:
       mongodb-version: "6.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
-    display_name: ${auth-and-ssl} ${topology}
+    display_name: ${auth-and-ssl} ${ruby} ${topology}
     tasks:
       - name: "test-mlaunch"
 
@@ -1071,7 +1071,7 @@ buildvariants:
       ruby: ["ruby-3.1", "jruby-9.3"]
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ['rhel8', 'debian11', 'ubuntu2204']
+      os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 6bcc75ef4a..17bc2cfdfc 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -53,7 +53,7 @@ buildvariants:
       mongodb-version: <%= latest_stable_mdb %>
       topology: <%= topologies %>
       os: rhel8
-    display_name: ${auth-and-ssl} ${topology}
+    display_name: ${auth-and-ssl} ${ruby} ${topology}
     tasks:
       - name: "test-mlaunch"
 
@@ -62,7 +62,7 @@ buildvariants:
       ruby: <%= recent_rubies %>
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
-      os: ['rhel8', 'debian11', 'ubuntu2204']
+      os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"

From 2a97b34a26d3fbb456882de54754da44a5eaba1f Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 24 May 2023 10:23:37 -0600
Subject: [PATCH 36/41] the file is /etc/os-release, not /etc/os_release

---
 .evergreen/run-tests-serverless.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh
index 32df87aafd..91171c1133 100755
--- a/.evergreen/run-tests-serverless.sh
+++ b/.evergreen/run-tests-serverless.sh
@@ -26,7 +26,7 @@ else
     exit -1
 fi
 
-if ! ( grep -q ^ID.*rhel /etc/os_release & grep -q ^VERSION_ID.*8.0 /etc/os_release ); then
+if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then
     echo Serverless tests assume rhel80
     echo If this has changed, update .evergreen/run-tests-serverless.sh as necessary
     exit -1

From 6df7397b9c96b6a224b237eabbe7f0d0e716402d Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 24 May 2023 12:10:00 -0600
Subject: [PATCH 37/41] remove jruby from FLE tests

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index c6fcfaa8a9..5a7330dfdd 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1348,12 +1348,24 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
+  - matrix_name: "fle-latest"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: "ruby-3.1"
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: [ 'latest' ]
+      os: rhel8
+      fle: helper
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+    tasks:
+      - name: "test-fle"
+
   - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
+      ruby: ["ruby-3.1", "ruby-2.7"]
       topology: [replica-set, sharded-cluster]
-      mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
+      mongodb-version: [ '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
       fle: helper
     display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 17bc2cfdfc..aea3c2108d 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -339,12 +339,24 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
+  - matrix_name: "fle-latest"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: <%= latest_ruby %>
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: [ 'latest' ]
+      os: rhel8
+      fle: helper
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+    tasks:
+      - name: "test-fle"
+
   - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: <%= sample_rubies %>
+      ruby: <%= sample_mri_rubies %>
       topology: [replica-set, sharded-cluster]
-      mongodb-version: [ 'latest', '6.0', '4.4', '4.2', '4.0' ]
+      mongodb-version: [ '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
       fle: helper
     display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"

From 8a70abf412f7017c27753a646042f59ee6314601 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 24 May 2023 14:13:27 -0600
Subject: [PATCH 38/41] comment out the failing tests (and reference the
 corresponding Jira tickets)

this will at least let us get this "build hosts" effort sorted
---
 .evergreen/config.yml              | 80 +++++++++++++++++-------------
 .evergreen/config/standard.yml.erb | 80 +++++++++++++++++-------------
 2 files changed, 92 insertions(+), 68 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 5a7330dfdd..a148446820 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1066,10 +1066,12 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: ["ruby-3.1", "jruby-9.3"]
-      mongodb-version: ['latest', '6.0']
+      #mongodb-version: ['latest', '6.0']
+      mongodb-version: ['6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1079,9 +1081,13 @@ buildvariants:
   # Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
   # issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
   # and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
+  #
+  # further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
+  # RUBY-3226)
   - matrix_name: "mongo-recent-arm"
     matrix_spec:
       ruby: "ruby-3.1"
+      #mongodb-version: ['latest', '6.0']
       mongodb-version: ['latest', '6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: 'rhel8-arm'
@@ -1240,21 +1246,24 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "x509-tests"
-    matrix_spec:
-      auth-and-ssl: "x509"
-      ruby: "ruby-3.1"
-      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
-      # the server for certain auth mechanisms. Once run-tests.sh is made smart
-      # enough to install mongosh, and then use either mongo or mongosh
-      # (depending on server version and what's available), we can bump this to
-      # the latest stable db version.
-      mongodb-version: "5.3"
-      topology: standalone
-      os: rhel8
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # The X.509 tests are failing with exceptions being expected, but never
+  # raised. (RUBY-3267)
+  #
+  # - matrix_name: "x509-tests"
+  #   matrix_spec:
+  #     auth-and-ssl: "x509"
+  #     ruby: "ruby-3.1"
+  #     # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+  #     # the server for certain auth mechanisms. Once run-tests.sh is made smart
+  #     # enough to install mongosh, and then use either mongo or mongosh
+  #     # (depending on server version and what's available), we can bump this to
+  #     # the latest stable db version.
+  #     mongodb-version: "5.3"
+  #     topology: standalone
+  #     os: rhel8
+  #   display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
+  #   tasks:
+  #     - name: "test-mlaunch"
 
   - matrix_name: "jruby-auth"
     matrix_spec:
@@ -1329,13 +1338,14 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "kerberos-integration"
-    matrix_spec:
-      ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
-      os: rhel8
-    display_name: "Kerberos integration ${os} ${ruby}"
-    tasks:
-      - name: "test-kerberos-integration"
+  # kerberos integration tests are broken (RUBY-3266)
+  # - matrix_name: "kerberos-integration"
+  #   matrix_spec:
+  #     ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
+  #     os: rhel8
+  #   display_name: "Kerberos integration ${os} ${ruby}"
+  #   tasks:
+  #     - name: "test-kerberos-integration"
 
   - matrix_name: "kerberos-unit"
     matrix_spec:
@@ -1348,17 +1358,19 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
-  - matrix_name: "fle-latest"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-3.1"
-      topology: [replica-set, sharded-cluster]
-      mongodb-version: [ 'latest' ]
-      os: rhel8
-      fle: helper
-    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
-    tasks:
-      - name: "test-fle"
+  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
+  #
+  # - matrix_name: "fle-latest"
+  #   matrix_spec:
+  #     auth-and-ssl: "noauth-and-nossl"
+  #     ruby: "ruby-3.1"
+  #     topology: [replica-set, sharded-cluster]
+  #     mongodb-version: [ 'latest' ]
+  #     os: rhel8
+  #     fle: helper
+  #   display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+  #   tasks:
+  #     - name: "test-fle"
 
   - matrix_name: "fle"
     matrix_spec:
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index aea3c2108d..5b3819958f 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -57,10 +57,12 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
+  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: <%= recent_rubies %>
-      mongodb-version: ['latest', '6.0']
+      #mongodb-version: ['latest', '6.0']
+      mongodb-version: ['6.0']
       topology: <%= topologies %>
       os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -70,9 +72,13 @@ buildvariants:
   # Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
   # issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
   # and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
+  #
+  # further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
+  # RUBY-3226)
   - matrix_name: "mongo-recent-arm"
     matrix_spec:
       ruby: <%= latest_ruby %>
+      #mongodb-version: ['latest', '6.0']
       mongodb-version: ['latest', '6.0']
       topology: <%= topologies %>
       os: 'rhel8-arm'
@@ -231,21 +237,24 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "x509-tests"
-    matrix_spec:
-      auth-and-ssl: "x509"
-      ruby: <%= latest_ruby %>
-      # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
-      # the server for certain auth mechanisms. Once run-tests.sh is made smart
-      # enough to install mongosh, and then use either mongo or mongosh
-      # (depending on server version and what's available), we can bump this to
-      # the latest stable db version.
-      mongodb-version: <%= latest_5x_mdb %>
-      topology: standalone
-      os: rhel8
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
+  # The X.509 tests are failing with exceptions being expected, but never
+  # raised. (RUBY-3267)
+  #
+  # - matrix_name: "x509-tests"
+  #   matrix_spec:
+  #     auth-and-ssl: "x509"
+  #     ruby: <%= latest_ruby %>
+  #     # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+  #     # the server for certain auth mechanisms. Once run-tests.sh is made smart
+  #     # enough to install mongosh, and then use either mongo or mongosh
+  #     # (depending on server version and what's available), we can bump this to
+  #     # the latest stable db version.
+  #     mongodb-version: <%= latest_5x_mdb %>
+  #     topology: standalone
+  #     os: rhel8
+  #   display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
+  #   tasks:
+  #     - name: "test-mlaunch"
 
   - matrix_name: "jruby-auth"
     matrix_spec:
@@ -320,13 +329,14 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: "kerberos-integration"
-    matrix_spec:
-      ruby: <%= sample_rubies %>
-      os: rhel8
-    display_name: "Kerberos integration ${os} ${ruby}"
-    tasks:
-      - name: "test-kerberos-integration"
+  # kerberos integration tests are broken (RUBY-3266)
+  # - matrix_name: "kerberos-integration"
+  #   matrix_spec:
+  #     ruby: <%= sample_rubies %>
+  #     os: rhel8
+  #   display_name: "Kerberos integration ${os} ${ruby}"
+  #   tasks:
+  #     - name: "test-kerberos-integration"
 
   - matrix_name: "kerberos-unit"
     matrix_spec:
@@ -339,17 +349,19 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
-  - matrix_name: "fle-latest"
-    matrix_spec:
-      auth-and-ssl: "noauth-and-nossl"
-      ruby: <%= latest_ruby %>
-      topology: [replica-set, sharded-cluster]
-      mongodb-version: [ 'latest' ]
-      os: rhel8
-      fle: helper
-    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
-    tasks:
-      - name: "test-fle"
+  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
+  #
+  # - matrix_name: "fle-latest"
+  #   matrix_spec:
+  #     auth-and-ssl: "noauth-and-nossl"
+  #     ruby: <%= latest_ruby %>
+  #     topology: [replica-set, sharded-cluster]
+  #     mongodb-version: [ 'latest' ]
+  #     os: rhel8
+  #     fle: helper
+  #   display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+  #   tasks:
+  #     - name: "test-fle"
 
   - matrix_name: "fle"
     matrix_spec:

From bf9fc5187d8802d7c2c81ad4879c84b64f397a28 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Wed, 24 May 2023 15:42:59 -0600
Subject: [PATCH 39/41] forgot to comment out 'latest'

---
 .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 a148446820..a7562f9210 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1088,7 +1088,7 @@ buildvariants:
     matrix_spec:
       ruby: "ruby-3.1"
       #mongodb-version: ['latest', '6.0']
-      mongodb-version: ['latest', '6.0']
+      mongodb-version: ['6.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: 'rhel8-arm'
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb
index 5b3819958f..fe04de6837 100644
--- a/.evergreen/config/standard.yml.erb
+++ b/.evergreen/config/standard.yml.erb
@@ -79,7 +79,7 @@ buildvariants:
     matrix_spec:
       ruby: <%= latest_ruby %>
       #mongodb-version: ['latest', '6.0']
-      mongodb-version: ['latest', '6.0']
+      mongodb-version: ['6.0']
       topology: <%= topologies %>
       os: 'rhel8-arm'
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"

From a708439d9b5e9a01faf0504fd9cba4a191099711 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamisbuck@gmail.com>
Date: Thu, 25 May 2023 07:53:39 -0600
Subject: [PATCH 40/41] cmake is only needed if the helper is being installed

Co-authored-by: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
---
 .evergreen/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 9b3d1d4af7..a2203eb79a 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -49,7 +49,7 @@ fi
 
 # Make sure cmake is installed (in case we need to install the libmongocrypt
 # helper)
-if test -n "$FLE"; then
+if [ "$FLE" = "helper" ]; then
   install_cmake
 fi
 

From 267bfe33c1b604416778920a3447182941aa0cfe Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis.buck@mongodb.com>
Date: Thu, 25 May 2023 10:16:52 -0600
Subject: [PATCH 41/41] bump spec/shared

---
 .gitmodules | 3 +--
 spec/shared | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 8303869258..6d428f359d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,5 +3,4 @@
 	url = https://github.com/mongodb-labs/drivers-evergreen-tools
 [submodule "spec/shared"]
 	path = spec/shared
-	url = git@github.com:jamis/mongo-ruby-spec-shared.git
-	branch = ruby-3232-debian-needs-ensurepip
+	url = git@github.com:mongodb-labs/mongo-ruby-spec-shared.git
diff --git a/spec/shared b/spec/shared
index 6a64d174d9..81298ee8ee 160000
--- a/spec/shared
+++ b/spec/shared
@@ -1 +1 @@
-Subproject commit 6a64d174d944d8f8eeb19296f43feacc3550d84b
+Subproject commit 81298ee8ee4bac7f446abcbd13045332396d05fe