From 989db9192bdc99bc6733ba126d8e5807ad3d8414 Mon Sep 17 00:00:00 2001
From: Adviti Mishra <adviti@umich.edu>
Date: Wed, 7 Aug 2024 13:49:25 -0400
Subject: [PATCH] Updated config.yml

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ee6e973aea..59ba7cfeb8 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1036,6 +1036,10 @@ axes:
   - id: "ruby"
     display_name: Ruby Version
     values:
+      - id: "ruby-3.3"
+        display_name: ruby-3.3
+        variables:
+          RVM_RUBY: "ruby-3.3"
       - id: "ruby-3.2"
         display_name: ruby-3.2
         variables:
@@ -1044,10 +1048,6 @@ axes:
         display_name: ruby-3.1
         variables:
           RVM_RUBY: "ruby-3.1"
-      - id: "ruby-3.1"
-        display_name: ruby-3.1
-        variables:
-          RVM_RUBY: "ruby-3.1"
       - id: "ruby-3.0"
         display_name: ruby-3.0
         variables:
@@ -1296,7 +1296,7 @@ axes:
 buildvariants:
   - matrix_name: DriverBench
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: standalone
     run_on: rhel80-large
@@ -1307,7 +1307,7 @@ buildvariants:
   - matrix_name: "auth/ssl"
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1317,7 +1317,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "jruby-9.4"]
       mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ['rhel8']
@@ -1329,7 +1329,7 @@ buildvariants:
 
   - matrix_name: "mongo-recent-arm"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: 'rhel8-arm'
@@ -1339,7 +1339,7 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: ['5.3', '5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1369,7 +1369,7 @@ buildvariants:
 
   - matrix_name: "single-lb"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: load-balanced
       single-mongos: single-mongos
@@ -1380,7 +1380,7 @@ buildvariants:
 
   - matrix_name: "mongo-5.0-api-version"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: '5.0'
       topology: standalone
       api-version-required: yes
@@ -1391,7 +1391,7 @@ buildvariants:
 
   - matrix_name: "single-mongos"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: "sharded-cluster"
       single-mongos: single-mongos
@@ -1413,7 +1413,7 @@ buildvariants:
   - matrix_name: "no-retry-reads"
     matrix_spec:
       retry-reads: no-retry-reads
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1424,7 +1424,7 @@ buildvariants:
   - matrix_name: "no-retry-writes"
     matrix_spec:
       retry-writes: no-retry-writes
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: [replica-set, sharded-cluster]
       os: rhel8
@@ -1446,7 +1446,7 @@ buildvariants:
   - matrix_name: "lint"
     matrix_spec:
       lint: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1457,7 +1457,7 @@ buildvariants:
   - matrix_name: "fork"
     matrix_spec:
       fork: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1468,7 +1468,7 @@ buildvariants:
   - matrix_name: "solo"
     matrix_spec:
       solo: on
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
       mongodb-version: "7.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
@@ -1490,7 +1490,7 @@ buildvariants:
   - matrix_name: "stress"
     matrix_spec:
       stress: on
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: ["6.0", "5.3"]
       topology: replica-set
       os: rhel8
@@ -1501,7 +1501,7 @@ buildvariants:
   - matrix_name: "x509-tests"
     matrix_spec:
       auth-and-ssl: "x509"
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.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
@@ -1528,7 +1528,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.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zlib'
@@ -1540,7 +1540,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.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'snappy'
@@ -1556,7 +1556,7 @@ buildvariants:
   - matrix_name: "zstd-auth"
     matrix_spec:
       auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zstd'
@@ -1567,7 +1567,7 @@ buildvariants:
 
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: replica-set
       as: as
@@ -1578,7 +1578,7 @@ buildvariants:
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: replica-set
       bson: "*"
@@ -1590,7 +1590,7 @@ buildvariants:
   # kerberos integration tests are broken (RUBY-3266)
   # - matrix_name: "kerberos-integration"
   #   matrix_spec:
-  #     ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+  #     ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7", "jruby-9.4"]
   #     os: rhel8
   #   display_name: "Kerberos integration ${os} ${ruby}"
   #   tasks:
@@ -1598,7 +1598,7 @@ buildvariants:
 
   - matrix_name: "kerberos-unit"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       mongodb-version: "7.0"
       topology: standalone
       os: rhel8
@@ -1610,7 +1610,7 @@ buildvariants:
   - matrix_name: "fle-latest"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       topology: [replica-set, sharded-cluster]
       mongodb-version: [ 'latest', '7.0' ]
       os: rhel8
@@ -1622,7 +1622,7 @@ buildvariants:
   - matrix_name: "fle"
     matrix_spec:
       auth-and-ssl: "noauth-and-nossl"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: [replica-set, sharded-cluster]
       mongodb-version: [ '6.0', '4.4', '4.2', '4.0' ]
       os: rhel8
@@ -1636,7 +1636,7 @@ buildvariants:
       # https://jira.mongodb.org/browse/RUBY-3311
       # auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
       auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       topology: standalone
       # 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
@@ -1653,7 +1653,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: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1666,7 +1666,7 @@ buildvariants:
       ocsp-algorithm: ecdsa
       ocsp-must-staple: on
       ocsp-delegate: on
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1679,7 +1679,7 @@ buildvariants:
     matrix_spec:
       ocsp-algorithm: rsa
       ocsp-status: unknown
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1695,7 +1695,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1709,7 +1709,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1723,7 +1723,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: fail
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1737,7 +1737,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1751,7 +1751,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1765,7 +1765,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1779,7 +1779,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1793,7 +1793,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1807,7 +1807,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: rhel8
@@ -1837,7 +1837,7 @@ buildvariants:
 
   - matrix_name: testgcpkms-variant
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       fle: helper
       topology: standalone
       os: rhel8
@@ -1861,7 +1861,7 @@ buildvariants:
 
   - matrix_name: atlas-full
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       os: rhel8
     display_name: "Atlas (Full)"
     tasks:
@@ -1869,7 +1869,7 @@ buildvariants:
 
   - matrix_name: "atlas"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
+      ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
       os: rhel8
     display_name: "Atlas tests ${ruby}"
     tasks:
@@ -1877,7 +1877,7 @@ buildvariants:
 
   - matrix_name: "serverless"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       fle: path
       os: ubuntu2204
     display_name: "Atlas serverless ${ruby}"
@@ -1886,7 +1886,7 @@ buildvariants:
 
   - matrix_name: "aws-lambda"
     matrix_spec:
-      ruby: "ruby-3.2"
+      ruby: "ruby-3.3"
       os: ubuntu2204
     display_name: "AWS Lambda"
     tasks: