RUBY-3726 Use new toolchain (#2958)

.evergreen/config.yml

@@ -168,6 +168,25 @@ functions:
 
           EOT
 
+  "run CSOT tests":
+    - command: shell.exec
+      type: test
+      params:
+        shell: bash
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          # Needed for generating temporary aws credentials.
+          if [ -n "${FLE}" ];
+          then
+            export AWS_ACCESS_KEY_ID="${fle_aws_key}"
+            export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
+            export AWS_DEFAULT_REGION="${fle_aws_region}"
+          fi
+          export CSOT_SPEC_TESTS=1
+          TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml" \
+            .evergreen/run-tests.sh
+
   "export FLE credentials":
     - command: shell.exec
       type: test
@@ -327,7 +346,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/tmp/rspec.xml
+        file: ./src/tmp/*.xml
 
   "delete private environment":
     - command: shell.exec
@@ -463,7 +482,7 @@ post:
   # Removed, causing timeouts
   # - func: "upload working dir"
   - func: "upload mo artifacts"
-  #- func: "upload test results"
+  - func: "upload test results"
   - func: "upload test results to s3"
 
 task_groups:
@@ -833,11 +852,10 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
-      - id: "latest"
-        display_name: "latest"
+      - id: "8.0"
+        display_name: "8.0"
         variables:
-          MONGODB_VERSION: "latest"
-          CRYPT_SHARED_VERSION: "latest"
+          MONGODB_VERSION: "8.0"
       - id: "7.0"
         display_name: "7.0"
         variables:
@@ -962,6 +980,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:
@@ -1119,7 +1141,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1804-small
+        run_on: ubuntu2004-small
         variables:
           MMAPV1: 'true'
 
@@ -1234,7 +1256,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.2"
-      mongodb-version: ["7.0", "6.0"]
+      mongodb-version: ["8.0", "7.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1244,7 +1266,7 @@ buildvariants:
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
-      mongodb-version: ["7.0", "6.0"]
+      mongodb-version: ["8.0", "7.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${ruby}"
@@ -1254,7 +1276,7 @@ buildvariants:
   - matrix_name: "mongo-recent-arm"
     matrix_spec:
       ruby: "ruby-3.2"
-      mongodb-version: ["7.0", "6.0"]
+      mongodb-version: ["8.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204-arm
     display_name: "${mongodb-version} ${os} ${topology} ${ruby}"
@@ -1263,28 +1285,18 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: '5.0'
+      ruby: ["ruby-3.3", "ruby-3.2"]
+      mongodb-version: ['5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${ruby}"
+      os: ubuntu2004
+    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"]
-      mongodb-version: ['4.4', '4.2', '4.0']
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-3.6"
-    matrix_spec:
-      ruby: "ruby-2.7"
-      mongodb-version: ['3.6']
+      mongodb-version: ['4.4', '4.2']
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} ${ruby}"
@@ -1346,17 +1358,6 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: mmapv1
-    matrix_spec:
-      ruby: "ruby-2.7"
-      mongodb-version: ['3.6', '4.0']
-      topology: ["standalone", "replica-set", "sharded-cluster"]
-      storage-engine: mmapv1
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
   - matrix_name: "lint"
     matrix_spec:
       lint: on
@@ -1393,8 +1394,8 @@ buildvariants:
   - matrix_name: "stress older"
     matrix_spec:
       stress: on
-      ruby: ["ruby-2.7"]
-      mongodb-version: ['4.2', '4.0', '3.6']
+      ruby: "ruby-2.7"
+      mongodb-version: ['4.4', '4.2']
       topology: replica-set
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1405,7 +1406,7 @@ buildvariants:
     matrix_spec:
       stress: on
       ruby: "ruby-3.2"
-      mongodb-version: ["6.0", "5.0"]
+      mongodb-version: ["8.0", "7.0"]
       topology: replica-set
       os: ubuntu2004
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1437,7 +1438,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-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zlib'
@@ -1449,7 +1450,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-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'snappy'
@@ -1465,7 +1466,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-2.7"]
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zstd'
@@ -1476,7 +1477,7 @@ buildvariants:
 
   - matrix_name: "activesupport"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: replica-set
       as: as
@@ -1487,7 +1488,7 @@ buildvariants:
 
   - matrix_name: "bson"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
       mongodb-version: "7.0"
       topology: replica-set
       bson: "*"
@@ -1531,7 +1532,7 @@ buildvariants:
       # 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.0"
+      mongodb-version: '5.0'
       os: ubuntu2004
     display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:
@@ -1554,7 +1555,7 @@ buildvariants:
       ocsp-algorithm: ecdsa
       ocsp-must-staple: on
       ocsp-delegate: on
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1567,7 +1568,7 @@ buildvariants:
     matrix_spec:
       ocsp-algorithm: rsa
       ocsp-status: unknown
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1583,7 +1584,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1597,7 +1598,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1611,7 +1612,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: fail
       extra-uri-options: "none"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1625,7 +1626,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1639,7 +1640,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1653,7 +1654,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsInsecure=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1667,7 +1668,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1681,7 +1682,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1695,7 +1696,7 @@ buildvariants:
       ocsp-delegate: '*'
       ocsp-connectivity: pass
       extra-uri-options: "tlsAllowInvalidCertificates=true"
-      ruby: ["ruby-3.2", "ruby-2.7"]
+      ruby: ["ruby-3.3", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
       os: ubuntu2004
@@ -1763,10 +1764,11 @@ buildvariants:
     tasks:
        - name: testatlas_task_group
 
-  - matrix_name: "aws-lambda"
-    matrix_spec:
-      ruby: 'ruby-3.2'
-      os: ubuntu2204
-    display_name: "AWS Lambda"
-    tasks:
-       - name: test_aws_lambda_task_group
+# https://jira.mongodb.org/browse/RUBY-3311
+#  - matrix_name: "aws-lambda"
+#    matrix_spec:
+#      ruby: 'ruby-3.2'
+#      os: ubuntu2204
+#    display_name: "AWS Lambda"
+#    tasks:
+#       - name: test_aws_lambda_task_group

.evergreen/config/axes.yml.erb

@@ -13,11 +13,10 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
-      - id: "latest"
-        display_name: "latest"
+      - id: "8.0"
+        display_name: "8.0"
         variables:
-          MONGODB_VERSION: "latest"
-          CRYPT_SHARED_VERSION: "latest"
+          MONGODB_VERSION: "8.0"
       - id: "7.0"
         display_name: "7.0"
         variables:
@@ -142,6 +141,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:
@@ -297,7 +300,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1804-small
+        run_on: ubuntu2004-small
         variables:
           MMAPV1: 'true'