Merge remote-tracking branch 'remotes/origin/master' into MONGOID-5336

Author: johnnyshields

.evergreen/config.yml

@@ -1,6 +1,5 @@
-########################################
-# Evergreen Template for MongoDB Drivers
-########################################
+# GENERATED FILE - DO NOT EDIT.
+# Run ./.evergreen/update-evergreen-configs to regenerate this file.
 
 # When a task that used to pass starts to fail
 # Go through all versions that may have been skipped to detect
@@ -25,7 +24,6 @@ timeout:
     params:
       script: |
         ls -la
-
 functions:
   "fetch source":
     # Executes git clone and applies the submitted patch, if any
@@ -96,6 +94,7 @@ functions:
               export AUTH=${AUTH}
               export SSL=${SSL}
               export APP_TESTS=${APP_TESTS}
+              export DOCKER_DISTRO=${DOCKER_DISTRO}
            EOT
            # See what we've done
            cat expansion.yml
@@ -283,7 +282,7 @@ functions:
             DRIVER="${DRIVER}" \
             I18N="${I18N}" \
             TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
-            ./egos .evergreen/run-tests.sh
+            ./egos .evergreen/run-tests-docker.sh
 
   "fix absolute paths":
     - command: shell.exec
@@ -322,11 +321,18 @@ tasks:
     - name: "test"
       commands:
         - func: "run tests"
-
 axes:
   - id: "mongodb-version"
     display_name: MongoDB Version
     values:
+      - id: "6.0"
+        display_name: "MongoDB 6.0"
+        variables:
+           VERSION: "5.0"
+      - id: "5.3"
+        display_name: "MongoDB 5.3"
+        variables:
+           VERSION: "5.3"
       - id: "5.0"
         display_name: "MongoDB 5.0"
         variables:
@@ -347,6 +353,7 @@ axes:
         display_name: "MongoDB 3.6"
         variables:
            VERSION: "3.6"
+  
   - id: "topology"
     display_name: Topology
     values:
@@ -363,6 +370,7 @@ axes:
         variables:
            TOPOLOGY: "sharded-cluster"
            SINGLE_MONGOS: true
+  
   - id: "auth"
     display_name: Authentication
     values:
@@ -374,6 +382,7 @@ axes:
         display_name: NoAuth
         variables:
            AUTH: "noauth"
+  
   - id: "ssl"
     display_name: SSL
     values:
@@ -385,6 +394,7 @@ axes:
         display_name: NoSSL
         variables:
            SSL: "nossl"
+  
   - id: "ruby"
     display_name: Ruby Version
     values:
@@ -412,6 +422,7 @@ axes:
         display_name: ruby-head
         variables:
            RVM_RUBY: "ruby-head"
+  
   - id: "jruby"
     display_name: JRuby Version
     values:
@@ -423,24 +434,36 @@ axes:
         display_name: jruby-9.3
         variables:
            RVM_RUBY: "jruby-9.3"
+  
   - id: "os"
     display_name: OS
     values:
       - id: ubuntu-16.04
         display_name: "Ubuntu 16.04"
         run_on: ubuntu1604-small
+        variables:
+          DOCKER_DISTRO: ubuntu1604
       - id: ubuntu-18.04
         display_name: "Ubuntu 18.04"
         run_on: ubuntu1804-small
+        variables:
+          DOCKER_DISTRO: ubuntu1804
       - id: ubuntu-20.04
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-small
+        variables:
+          DOCKER_DISTRO: ubuntu2004
       - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70-small
+        variables:
+          DOCKER_DISTRO: rhel70
       - id: rhel80
         display_name: "RHEL 8.0"
         run_on: rhel80-small
+        variables:
+          DOCKER_DISTRO: rhel80
+          
   - id: "driver"
     display_name: Driver Version
     values:
@@ -488,6 +511,7 @@ axes:
         display_name: "BSON-master"
         variables:
           DRIVER: "bson-master"
+          
   - id: "rails"
     display_name: Rails Version
     values:
@@ -515,6 +539,7 @@ axes:
         display_name: "Rails 7.0"
         variables:
           RAILS: "7.0"
+          
   - id: "i18n"
     display_name: I18n version
     values:
@@ -524,31 +549,42 @@ axes:
            I18N: "1.0"
       - id: current
         display_name: "i18n-current"
+        
   - id: "test-i18n-fallbacks"
     display_name: Test i18n fallbacks
     values:
       - id: yes
         display_name: "i18n-fallbacks"
         variables:
            TEST_I18N_FALLBACKS: yes
+           
   - id: app-tests
     display_name: Mongoid application tests
     values:
       - id: yes
         display_name: Yes
         variables:
           APP_TESTS: yes
-
 buildvariants:
 - matrix_name: "ruby-3.1"
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
     topology: '*'
-    mongodb-version: ['5.0']
+    mongodb-version: ['6.0']
+    os: ubuntu-20.04
+  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
+  tasks:
+    - name: "test"
+
+- matrix_name: "mongodb-5.3"
+  matrix_spec:
+    ruby: ["ruby-3.1"]
+    driver: ["current"]
+    topology: '*'
+    mongodb-version: ['5.3']
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -558,9 +594,8 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['5.0']
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -570,9 +605,8 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set', 'sharded-cluster']
     mongodb-version: '5.0'
+    os: ubuntu-18.04
   display_name: "${jruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1804-small
   tasks:
     - name: "test"
 
@@ -582,9 +616,8 @@ buildvariants:
     driver: ["current"]
     topology: '*'
     mongodb-version: ['4.4']
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1804-small
   tasks:
     - name: "test"
 
@@ -594,9 +627,8 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['4.0']
+    os: ubuntu-16.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1604-small
   tasks:
     - name: "test"
 
@@ -606,9 +638,8 @@ buildvariants:
     driver: ["current"]
     topology: ['replica-set']
     mongodb-version: ['3.6']
+    os: ubuntu-16.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1604-small
   tasks:
     - name: "test"
 
@@ -618,9 +649,8 @@ buildvariants:
     ruby: ["ruby-3.1"]
     mongodb-version: "5.0"
     topology: ['replica-set', 'sharded-cluster']
+    os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu2004-small
   tasks:
      - name: "test"
 
@@ -630,9 +660,8 @@ buildvariants:
     ruby: ["ruby-2.5"]
     mongodb-version: "4.0"
     topology: ['replica-set', 'sharded-cluster']
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -642,9 +671,8 @@ buildvariants:
     ruby: ["ruby-2.5"]
     mongodb-version: "3.6"
     topology: "standalone"
+    os: ubuntu-16.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1604-small
   tasks:
      - name: "test"
 
@@ -655,9 +683,8 @@ buildvariants:
     mongodb-version: "5.0"
     topology: "standalone"
     rails: ['7.0']
+    os: ubuntu-20.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
-  run_on:
-    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -667,9 +694,8 @@ buildvariants:
     ruby: ["ruby-2.7"]
     mongodb-version: "5.0"
     topology: "standalone"
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1804-small
   tasks:
     - name: "test"
 
@@ -679,9 +705,8 @@ buildvariants:
     ruby: ["ruby-3.0"]
     mongodb-version: "5.0"
     topology: "standalone"
+    os: ubuntu-18.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
-  run_on:
-    - ubuntu1804-small
   tasks:
     - name: "test"
 
@@ -693,9 +718,8 @@ buildvariants:
     mongodb-version: "5.0"
     topology: "standalone"
     rails: ['6.0', '6.1']
+    os: ubuntu-20.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
-  run_on:
-    - ubuntu2004-small
   tasks:
      - name: "test"
 
@@ -706,9 +730,8 @@ buildvariants:
     mongodb-version: "4.0"
     topology: "standalone"
     rails: ['5.1', '5.2']
+    os: ubuntu-18.04
   display_name: "${rails}, ${driver}, ${mongodb-version}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -719,9 +742,8 @@ buildvariants:
     mongodb-version: "4.4"
     topology: "standalone"
     i18n: '1.0'
+    os: ubuntu-18.04
   display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -733,9 +755,8 @@ buildvariants:
     topology: "standalone"
     i18n: '*'
     test-i18n-fallbacks: yes
+    os: ubuntu-18.04
   display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -746,10 +767,9 @@ buildvariants:
     mongodb-version: '5.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.0', '6.1']
+    rails: ['6.0', '6.1', '7.0']
+    os: ubuntu-20.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
-  run_on:
-    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -761,9 +781,8 @@ buildvariants:
     topology: standalone
     app-tests: yes
     rails: ['5.1', '5.2']
+    os: ubuntu-18.04
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"
 
@@ -775,8 +794,7 @@ buildvariants:
     topology: standalone
     app-tests: yes
     rails: ['6.0']
+    os: ubuntu-18.04
   display_name: "app tests ${driver}, ${jruby}"
-  run_on:
-    - ubuntu1804-small
   tasks:
      - name: "test"