RUBY-3726 Use new toolchain

.evergreen/config.yml

@@ -179,7 +179,7 @@ functions:
             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" \
+          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":
@@ -341,7 +341,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/rspec.xml
+        file: ./src/tmp/*.xml
 
   "delete private environment":
     - command: shell.exec
@@ -430,7 +430,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:
@@ -761,11 +761,6 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
-      - id: "latest"
-        display_name: "latest"
-        variables:
-          MONGODB_VERSION: "latest"
-          CRYPT_SHARED_VERSION: "latest"
       - id: "8.0"
         display_name: "8.0"
         variables:
@@ -1064,7 +1059,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1804-small
+        run_on: ubuntu2004-small
         variables:
           MMAPV1: 'true'
 
@@ -1179,7 +1174,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.3"
-      mongodb-version: ["latest", "8.0", "7.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}
@@ -1189,7 +1184,7 @@ buildvariants:
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
-      mongodb-version: ["latest", "8.0", "7.0"]
+      mongodb-version: ["8.0", "7.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1208,28 +1203,18 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
+      ruby: ["ruby-3.3", "ruby-3.2"]
       mongodb-version: ['5.0']
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu1804
+      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} ${auth-and-ssl} ${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} ${auth-and-ssl} ${ruby}"
@@ -1301,17 +1286,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
@@ -1349,7 +1323,7 @@ buildvariants:
     matrix_spec:
       stress: on
       ruby: "ruby-2.7"
-      mongodb-version: ['4.2', '4.0', '3.6']
+      mongodb-version: ['4.4', '4.2']
       topology: replica-set
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1798,10 +1772,11 @@ buildvariants:
     tasks:
        - name: test-atlas
 
-  - 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,6 @@ axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
-      - id: "latest"
-        display_name: "latest"
-        variables:
-          MONGODB_VERSION: "latest"
-          CRYPT_SHARED_VERSION: "latest"
       - id: "8.0"
         display_name: "8.0"
         variables:
@@ -314,7 +309,7 @@ axes:
     values:
       - id: mmapv1
         display_name: MMAPv1
-        run_on: ubuntu1804-small
+        run_on: ubuntu2004-small
         variables:
           MMAPV1: 'true'
 

.evergreen/config/common.yml.erb

@@ -176,7 +176,7 @@ functions:
             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" \
+          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":
@@ -338,7 +338,7 @@ functions:
   "upload test results":
     - command: attach.xunit_results
       params:
-        file: ./src/rspec.xml
+        file: ./src/tmp/*.xml
 
   "delete private environment":
     - command: shell.exec
@@ -427,7 +427,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:

.evergreen/config/standard.yml.erb

@@ -8,7 +8,9 @@
   # these are used for testing against a few recent ruby versions
   recent_rubies = %w( ruby-3.3 ruby-3.2 jruby-9.4 )
 
-  # this is a list of the most most recent 3.x and 2.x MRI ruby versions
+  recent_mri_rubies = %w( ruby-3.3 ruby-3.2 )
+
+  # this is a list of the most recent 3.x and 2.x MRI ruby versions
   sample_mri_rubies = %w( ruby-3.3 ruby-2.7 )
 
   # as above, but including the most recent JRuby release
@@ -33,12 +35,8 @@
   # The latest stable version of MongoDB
   latest_stable_mdb = "8.0".inspect # so it gets quoted as a string
 
-  # A few of the most recent MongoDB versions
-  actual_and_upcoming_mdb = %w( latest 8.0 7.0 )
 
   recent_mdb = %w( 8.0 7.0 )
-
-  all_dbs = %w(latest 8.0 7.0 6.0 5.0 4.4 4.2 4.0 3.6)
 %>
 
 buildvariants:
@@ -56,7 +54,7 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
-      mongodb-version: <%= actual_and_upcoming_mdb %>
+      mongodb-version: <%= recent_mdb %>
       topology: <%= topologies %>
       os: ubuntu2204
     display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -66,7 +64,7 @@ buildvariants:
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: <%= recent_rubies %>
-      mongodb-version: <%= actual_and_upcoming_mdb %>
+      mongodb-version: <%= recent_mdb %>
       topology: <%= topologies %>
       os: ubuntu2204
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -85,28 +83,18 @@ buildvariants:
 
   - matrix_name: "mongo-5.x"
     matrix_spec:
-      ruby: <%= recent_rubies %>
+      ruby: <%= recent_mri_rubies %>
       mongodb-version: ['5.0']
       topology: <%= topologies %>
-      os: ubuntu1804
+      os: ubuntu2004
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
   - matrix_name: "mongo-4.x"
     matrix_spec:
       ruby: <%= older_rubies %>
-      mongodb-version: ['4.4', '4.2', '4.0']
-      topology: <%= topologies %>
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
-  - matrix_name: "mongo-3.6"
-    matrix_spec:
-      ruby: <%= supported_mri_ruby_2 %>
-      mongodb-version: ['3.6']
+      mongodb-version: ['4.4', '4.2']
       topology: <%= topologies %>
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -178,17 +166,6 @@ buildvariants:
     tasks:
       - name: "test-mlaunch"
 
-  - matrix_name: mmapv1
-    matrix_spec:
-      ruby: <%= supported_mri_ruby_2 %>
-      mongodb-version: ['3.6', '4.0']
-      topology: <%= topologies %>
-      storage-engine: mmapv1
-      os: ubuntu1804
-    display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
-    tasks:
-      - name: "test-mlaunch"
-
   - matrix_name: "lint"
     matrix_spec:
       lint: on
@@ -226,7 +203,7 @@ buildvariants:
     matrix_spec:
       stress: on
       ruby: <%= supported_mri_ruby_2 %>
-      mongodb-version: ['4.2', '4.0', '3.6']
+      mongodb-version: ['4.4', '4.2']
       topology: replica-set
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -523,10 +500,11 @@ buildvariants:
     tasks:
        - name: test-atlas
 
-  - 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/run-tests-atlas-full.sh

@@ -8,14 +8,27 @@ set -ex
 
 set_env_vars
 set_env_python
-set_env_ruby
+
+# Install rbenv and download the requested ruby version
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
+
+export JAVA_HOME=/opt/java/jdk21
+export JAVACMD=$JAVA_HOME/bin/java
 
 bundle_install
 
 ATLAS_URI=$MONGODB_URI \
   KILL_ALL_SERVER_SESSIONS=0 \
   EXAMPLE_TIMEOUT=600 \
-  bundle exec rspec -fd spec/integration/search_indexes_prose_spec.rb
+  bundle exec rspec -fd spec/integration/search_indexes_prose_spec.rb \
+  --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml
 
 test_status=$?
 

.evergreen/run-tests-atlas.sh

@@ -8,12 +8,25 @@ set -ex
 
 set_env_vars
 set_env_python
-set_env_ruby
+
+# Install rbenv and download the requested ruby version
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
+
+export JAVA_HOME=/opt/java/jdk21
+export JAVACMD=$JAVA_HOME/bin/java
 
 bundle_install
 
 echo "Running specs"
 
 export ATLAS_TESTING=1
 
-bundle exec rspec spec/atlas -fd
+bundle exec rspec spec/atlas \
+  --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml

.evergreen/run-tests-azure.sh

@@ -8,7 +8,19 @@ set -ex
 
 set_env_vars
 set_env_python
-set_env_ruby
+
+# Install rbenv and download the requested ruby version
+rm -rf ~/.rbenv
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+rm -rf ~/.rbenv/versions/
+curl --retry 3 -fL http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/`host_distro`/$RVM_RUBY.tar.xz |tar -xC $HOME/.rbenv/ -Jf -
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init - bash)"
+export FULL_RUBY_VERSION=$(ls ~/.rbenv/versions | head -n1)
+rbenv global $FULL_RUBY_VERSION
+
+export JAVA_HOME=/opt/java/jdk21
+export JAVACMD=$JAVA_HOME/bin/java
 
 sudo apt-get -y install libyaml-dev cmake