Merge branch 'master' into fix-broken-database_rake_spec

mongodb · Jan 17, 2024 · b6f0f1f · b6f0f1f
2 parents af54a74 + fed822a
commit b6f0f1f
Show file tree

Hide file tree

Showing 80 changed files with 1,356 additions and 994 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -88,7 +88,6 @@ functions:
             export RVM_RUBY="${RVM_RUBY}"
             export RAILS="${RAILS}"
             export DRIVER="${DRIVER}"
-            export I18N="${I18N}"
             export TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}"
             export FLE="${FLE}"
           EOT
@@ -276,7 +275,6 @@ functions:
             RVM_RUBY="${RVM_RUBY}" \
             RAILS="${RAILS}" \
             DRIVER="${DRIVER}" \
-            I18N="${I18N}" \
             TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
             FLE="${FLE}" \
             .evergreen/run-tests-docker.sh
@@ -458,10 +456,6 @@ axes:
   - id: "ruby"
     display_name: Ruby Version
     values:
-      - id: "ruby-2.6"
-        display_name: ruby-2.6
-        variables:
-           RVM_RUBY: "ruby-2.6"
       - id: "ruby-2.7"
         display_name: ruby-2.7
         variables:
@@ -486,22 +480,22 @@ axes:
   - id: "jruby"
     display_name: JRuby Version
     values:
-      - id: "jruby-9.3"
-        display_name: jruby-9.3
+      - id: "jruby-9.4"
+        display_name: jruby-9.4
         variables:
-           RVM_RUBY: "jruby-9.3"
+           RVM_RUBY: "jruby-9.4"
 
   - id: "os"
     display_name: OS
     values:
       - id: actual-ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
-      - id: ubuntu-18.04
-        display_name: "Ubuntu 18.04"
+      - id: ubuntu-20.04
+        display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
         variables:
-          DOCKER_DISTRO: ubuntu1804
+          DOCKER_DISTRO: ubuntu2004
       - id: ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2004-small
@@ -573,10 +567,6 @@ axes:
         display_name: "Rails master"
         variables:
           RAILS: "master"
-      - id: "5.2"
-        display_name: "Rails 5.2"
-        variables:
-          RAILS: "5.2"
       - id: "6.0"
         display_name: "Rails 6.0"
         variables:
@@ -594,16 +584,6 @@ axes:
         variables:
           RAILS: "7.1"
 
-  - id: "i18n"
-    display_name: I18n version
-    values:
-      - id: '1.0'
-        display_name: "i18n-1.0"
-        variables:
-           I18N: "1.0"
-      - id: current
-        display_name: "i18n-current"
-
   - id: "test-i18n-fallbacks"
     display_name: Test i18n fallbacks
     values:
@@ -678,7 +658,7 @@ buildvariants:
 
 - matrix_name: "jruby"
   matrix_spec:
-    jruby: ["jruby-9.3"]
+    jruby: ["jruby-9.4"]
     driver: ["current"]
     topology: ['replica-set', 'sharded-cluster']
     mongodb-version: '5.0'
@@ -698,17 +678,6 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-2.6"
-  matrix_spec:
-    ruby: ["ruby-2.6"]
-    driver: ["current"]
-    topology: ['replica-set']
-    mongodb-version: ['4.0']
-    os: rhel80
-  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  tasks:
-    - name: "test"
-
 - matrix_name: "driver-upcoming"
   matrix_spec:
     driver: [master, stable]
@@ -723,7 +692,7 @@ buildvariants:
 - matrix_name: "driver-oldstable"
   matrix_spec:
     driver: [oldstable, min]
-    ruby: ["ruby-2.6"]
+    ruby: ["ruby-2.7"]
     mongodb-version: "4.0"
     topology: ['replica-set', 'sharded-cluster']
     os: rhel80
@@ -734,7 +703,7 @@ buildvariants:
 - matrix_name: "driver-min"
   matrix_spec:
     driver: [min]
-    ruby: ["ruby-2.6"]
+    ruby: ["ruby-2.7"]
     mongodb-version: "3.6"
     topology: "standalone"
     os: rhel80
@@ -790,81 +759,57 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: "rails-5"
-  matrix_spec:
-    ruby: ["ruby-2.7"]
-    driver: ["current"]
-    mongodb-version: "4.0"
-    topology: "standalone"
-    rails: ['5.2']
-    os: rhel80
-  display_name: "${rails}, ${driver}, ${mongodb-version}"
-  tasks:
-     - name: "test"
-
-- matrix_name: "i18n-1.0"
-  matrix_spec:
-    ruby: "ruby-2.6"
-    driver: ["current"]
-    mongodb-version: "4.4"
-    topology: "standalone"
-    i18n: '1.0'
-    os: rhel80
-  display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
-  tasks:
-     - name: "test"
-
 - matrix_name: "i18n-fallbacks"
   matrix_spec:
-    ruby: "ruby-2.6"
+    ruby: "ruby-2.7"
     driver: ["current"]
     mongodb-version: "4.2"
     topology: "standalone"
-    i18n: '*'
     test-i18n-fallbacks: yes
     os: rhel80
-  display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
+  display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
   tasks:
      - name: "test"
 
-- matrix_name: app-tests-ruby-3
+- matrix_name: app-tests-rails-7
   matrix_spec:
-    ruby: ["ruby-3.0", "ruby-3.1", "ruby-3.2"]
+    ruby: ["ruby-3.1", "ruby-3.2"]
     driver: ["current"]
     mongodb-version: '6.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.0', '6.1', '7.0', '7.1']
-    os: rhel80
+    rails: ['6.1', '7.0', '7.1']
+    os: ubuntu-20.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
     - name: "test"
 
-- matrix_name: app-tests-ruby-2.7
+- matrix_name: app-tests-rails-6-0
   matrix_spec:
-    ruby: ruby-2.7
+    ruby: ["ruby-2.7"]
     driver: ["current"]
     mongodb-version: '5.0'
     topology: standalone
     app-tests: yes
-    rails: ['5.2']
+    rails: ['6.0']
     os: rhel80
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
      - name: "test"
 
-- matrix_name: app-tests-jruby
-  matrix_spec:
-    jruby: ["jruby-9.3"]
-    driver: ["current"]
-    mongodb-version: '5.0'
-    topology: standalone
-    app-tests: yes
-    rails: ['6.0']
-    os: ubuntu-18.04
-  display_name: "app tests ${driver}, ${jruby}"
-  tasks:
-     - name: "test"
+# https://github.com/rails/rails/issues/49737
+#- matrix_name: app-tests-jruby-9-4
+#  matrix_spec:
+#    jruby: ["jruby-9.4"]
+#    driver: ["current"]
+#    mongodb-version: '5.0'
+#    topology: standalone
+#    app-tests: yes
+#    rails: ['7.1']
+#    os: ubuntu-20.04
+#  display_name: "app tests ${driver}, ${jruby}"
+#  tasks:
+#     - name: "test"
 
 - matrix_name: "auto-encryption"
   matrix_spec:

diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -83,10 +83,6 @@ axes:
   - id: "ruby"
     display_name: Ruby Version
     values:
-      - id: "ruby-2.6"
-        display_name: ruby-2.6
-        variables:
-           RVM_RUBY: "ruby-2.6"
       - id: "ruby-2.7"
         display_name: ruby-2.7
         variables:
@@ -111,22 +107,22 @@ axes:
   - id: "jruby"
     display_name: JRuby Version
     values:
-      - id: "jruby-9.3"
-        display_name: jruby-9.3
+      - id: "jruby-9.4"
+        display_name: jruby-9.4
         variables:
-           RVM_RUBY: "jruby-9.3"
+           RVM_RUBY: "jruby-9.4"
 
   - id: "os"
     display_name: OS
     values:
       - id: actual-ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2204-small
-      - id: ubuntu-18.04
-        display_name: "Ubuntu 18.04"
+      - id: ubuntu-20.04
+        display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
         variables:
-          DOCKER_DISTRO: ubuntu1804
+          DOCKER_DISTRO: ubuntu2004
       - id: ubuntu-22.04
         display_name: "Ubuntu 22.04"
         run_on: ubuntu2004-small
@@ -198,10 +194,6 @@ axes:
         display_name: "Rails master"
         variables:
           RAILS: "master"
-      - id: "5.2"
-        display_name: "Rails 5.2"
-        variables:
-          RAILS: "5.2"
       - id: "6.0"
         display_name: "Rails 6.0"
         variables:
@@ -219,16 +211,6 @@ axes:
         variables:
           RAILS: "7.1"
 
-  - id: "i18n"
-    display_name: I18n version
-    values:
-      - id: '1.0'
-        display_name: "i18n-1.0"
-        variables:
-           I18N: "1.0"
-      - id: current
-        display_name: "i18n-current"
-
   - id: "test-i18n-fallbacks"
     display_name: Test i18n fallbacks
     values:

diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
@@ -62,7 +62,6 @@ functions:
             export RVM_RUBY="${RVM_RUBY}"
             export RAILS="${RAILS}"
             export DRIVER="${DRIVER}"
-            export I18N="${I18N}"
             export TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}"
             export FLE="${FLE}"
           EOT
@@ -250,7 +249,6 @@ functions:
             RVM_RUBY="${RVM_RUBY}" \
             RAILS="${RAILS}" \
             DRIVER="${DRIVER}" \
-            I18N="${I18N}" \
             TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
             FLE="${FLE}" \
             .evergreen/run-tests-docker.sh