RUBY-3551 Add Ruby 3.3 to test matrix (#339)

mongodb · Oct 23, 2024 · e1f5d8f · e1f5d8f
1 parent bc942e1
commit e1f5d8f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 53 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -29,7 +29,6 @@ timeout:
       script: |
         ls -la
 
-
 # -----------------------------------------------
 # .evergreen/config/functions.yml.erb
 # -----------------------------------------------
@@ -241,7 +240,6 @@ tasks:
       commands:
         - func: "run tests"
 
-
 # -----------------------------------------------
 # .evergreen/config/axes.yml.erb
 # -----------------------------------------------
@@ -255,66 +253,58 @@ axes:
         run_on: debian11-small
         variables:
           MACHINE: "debian11"
-      - id: "ubuntu"
+      - id: "ubuntu2204"
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
         variables:
           MACHINE: "ubuntu2204"
-      - id: "rhel"
-        display_name: "RHEL 8.0"
-        run_on: rhel80-small
+      - id: "ubuntu2004"
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-small
         variables:
-          MACHINE: "rhel80"
+          MACHINE: "ubuntu2004"
 
   - id: "special-os"
     display_name: OS
     values:
-      - id: "rhel82-arm64"
-        display_name: "RHEL 8.2 ARM64"
-        run_on: rhel82-arm64-small
+      - id: "ubuntu2204-arm64"
+        display_name: "Ubuntu 22.04 ARM64"
+        run_on: ubuntu2204-arm64-small
         variables:
-          MACHINE: rhel82-arm64
+          MACHINE: ubuntu2204-arm64
 
   - 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:
            RVM_RUBY: ruby-3.2
-
       - 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:
            RVM_RUBY: ruby-3.0
-
       - id: ruby-2.7
         display_name: ruby-2.7
         variables:
            RVM_RUBY: ruby-2.7
-
-      - id: ruby-2.6
-        display_name: ruby-2.6
-        variables:
-           RVM_RUBY: ruby-2.6
-
       - id: jruby-9.4
         display_name: jruby-9.4
         variables:
            RVM_RUBY: jruby-9.4
-
       - id: jruby-9.3
         display_name: jruby-9.3
         variables:
            RVM_RUBY: jruby-9.3
 
-
   - id: "as"
     display_name: ActiveSupport
     values:
@@ -347,37 +337,36 @@ axes:
         variables:
           COMPACT: true
 
-
 # -----------------------------------------------
 # .evergreen/config/variants.yml.erb
 # -----------------------------------------------
 
 buildvariants:
   - matrix_name: "mri-latest"
-    matrix_spec: { ruby: ruby-3.2, all-os: '*' }
+    matrix_spec: { ruby: ruby-3.3, all-os: '*' }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "mri-sample"
-    matrix_spec: { ruby: ["ruby-2.7"], all-os: rhel }
+    matrix_spec: { ruby: ["ruby-2.7"], all-os: ubuntu2004 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "activesupport-5-6"
     matrix_spec:
-      ruby: ["ruby-3.0", "ruby-2.7", "ruby-2.6"]
-      all-os: rhel
+      ruby: ["ruby-3.0", "ruby-2.7"]
+      all-os: ubuntu2004
       as: [ '5.1', '5.2', '6.0', '6.1' ]
     display_name: "AS ${as} ${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "activesupport-7"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7"]
-      all-os: rhel
+      ruby: ["ruby-3.3", "ruby-2.7"]
+      all-os: ubuntu2004
       as: '7.0'
     display_name: "AS ${as} ${ruby}, ${all-os}"
     tasks:
@@ -390,15 +379,15 @@ buildvariants:
       - name: "test"
 
   - matrix_name: "jruby"
-    matrix_spec: { ruby: ["jruby-9.4", "jruby-9.3"], all-os: rhel }
+    matrix_spec: { ruby: ["jruby-9.4", "jruby-9.3"], all-os: ubuntu2204 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "compact"
     matrix_spec:
-      ruby: ["ruby-3.2", "ruby-2.7"]
-      all-os: rhel
+      ruby: ["ruby-3.3", "ruby-2.7"]
+      all-os: ubuntu2004
       compact: "on"
     display_name: "${ruby} with GC.compact"
     tasks:

diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -7,25 +7,25 @@ axes:
         run_on: debian11-small
         variables:
           MACHINE: "debian11"
-      - id: "ubuntu"
+      - id: "ubuntu2204"
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
         variables:
           MACHINE: "ubuntu2204"
-      - id: "rhel"
-        display_name: "RHEL 8.0"
-        run_on: rhel80-small
+      - id: "ubuntu2004"
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-small
         variables:
-          MACHINE: "rhel80"
+          MACHINE: "ubuntu2004"
 
   - id: "special-os"
     display_name: OS
     values:
-      - id: "rhel82-arm64"
-        display_name: "RHEL 8.2 ARM64"
-        run_on: rhel82-arm64-small
+      - id: "ubuntu2204-arm64"
+        display_name: "Ubuntu 22.04 ARM64"
+        run_on: ubuntu2204-arm64-small
         variables:
-          MACHINE: rhel82-arm64
+          MACHINE: ubuntu2204-arm64
 
   - id: ruby
     display_name: Ruby Version

diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
@@ -6,15 +6,15 @@ buildvariants:
       - name: "test"
 
   - matrix_name: "mri-sample"
-    matrix_spec: { ruby: <%= sample_without_latest %>, all-os: rhel }
+    matrix_spec: { ruby: <%= sample_without_latest %>, all-os: ubuntu2004 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "activesupport-5-6"
     matrix_spec:
       ruby: <%= older_rubies %>
-      all-os: rhel
+      all-os: ubuntu2004
       as: [ '5.1', '5.2', '6.0', '6.1' ]
     display_name: "AS ${as} ${ruby}, ${all-os}"
     tasks:
@@ -23,7 +23,7 @@ buildvariants:
   - matrix_name: "activesupport-7"
     matrix_spec:
       ruby: <%= sample_mri_rubies %>
-      all-os: rhel
+      all-os: ubuntu2004
       as: '7.0'
     display_name: "AS ${as} ${ruby}, ${all-os}"
     tasks:
@@ -36,15 +36,15 @@ buildvariants:
       - name: "test"
 
   - matrix_name: "jruby"
-    matrix_spec: { ruby: <%= jrubies %>, all-os: rhel }
+    matrix_spec: { ruby: <%= jrubies %>, all-os: ubuntu2204 }
     display_name: "${ruby}, ${all-os}"
     tasks:
       - name: "test"
 
   - matrix_name: "compact"
     matrix_spec:
       ruby: <%= sample_mri_rubies %>
-      all-os: rhel
+      all-os: ubuntu2004
       compact: "on"
     display_name: "${ruby} with GC.compact"
     tasks:

diff --git a/.evergreen/update-evergreen-configs b/.evergreen/update-evergreen-configs
@@ -81,12 +81,12 @@ module ConfigProcessor
   # the most recently released, stable version of Ruby (make sure this
   # version is being built by 10gen/mongo-ruby-toolchain)
   def latest_mri_ruby
-    "ruby-3.2"
+    "ruby-3.3"
   end
 
   # this is a list of the most most recent 3.x and 2.x MRI ruby versions
   def sample_mri_rubies
-    @sample_mri_rubies ||= %w[ ruby-3.2 ruby-2.7 ]
+    @sample_mri_rubies ||= %w[ ruby-3.3 ruby-2.7 ]
   end
 
   # same as `sample_mri_rubies`, but without the `latest_mri_ruby` entry.
@@ -101,7 +101,7 @@ module ConfigProcessor
 
   # older Ruby versions provided by 10gen/mongo-ruby-toolchain
   def older_rubies
-    @older_rubies ||= %w[ ruby-3.0 ruby-2.7 ruby-2.6 ]
+    @older_rubies ||= %w[ ruby-3.0 ruby-2.7 ]
   end
 
   # all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
@@ -112,8 +112,8 @@ module ConfigProcessor
   # all supported MRI ruby versions
   def supported_mri_rubies
     @supported_mri_rubies ||= %w[
-      ruby-3.2 ruby-3.1 ruby-3.0
-      ruby-2.7 ruby-2.6
+      ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0
+      ruby-2.7
     ]
   end
 

diff --git a/spec/shared b/spec/shared
+1 −1		lib/mrss/docker_runner.rb
+1 −1		lib/mrss/server_version_registry.rb
+12 −52		share/Dockerfile.erb
+18 −10		shlib/server.sh
+5 −28		shlib/set_env.sh