RUBY-3246 Test against 7.0 (#2725)

* Add 7.0 to text setup

* Try to fix query cache spec

* Try to fix snapshot query example

* Disable latest for now

* Get latest back

* Do not test latest on ubuntu2204

* Fix failed specs

Author: comandeo-mongo

.evergreen/config.yml

@@ -668,6 +668,10 @@ axes:
         variables:
           MONGODB_VERSION: "latest"
           CRYPT_SHARED_VERSION: "latest"
+      - id: "7.0"
+        display_name: "7.0"
+        variables:
+          MONGODB_VERSION: "7.0"
       - id: "6.0"
         display_name: "6.0"
         variables:
@@ -1059,21 +1063,21 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: "ruby-3.1"
-      mongodb-version: "6.0"
+      mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: rhel8
     display_name: ${auth-and-ssl} ${ruby} ${topology}
     tasks:
       - name: "test-mlaunch"
 
-  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: ["ruby-3.1", "jruby-9.3"]
-      #mongodb-version: ['latest', '6.0']
-      mongodb-version: ['6.0']
+      mongodb-version: ["latest", "7.0", "6.0"]
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ['rhel8', 'ubuntu2204']
+      os: ['rhel8']
+      # There is no latest for ubuntu2204, so we can't test it here.
+      # os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1358,19 +1362,17 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
-  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
-  #
-  # - matrix_name: "fle-latest"
-  #   matrix_spec:
-  #     auth-and-ssl: "noauth-and-nossl"
-  #     ruby: "ruby-3.1"
-  #     topology: [replica-set, sharded-cluster]
-  #     mongodb-version: [ 'latest' ]
-  #     os: rhel8
-  #     fle: helper
-  #   display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
-  #   tasks:
-  #     - name: "test-fle"
+  - matrix_name: "fle-latest"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: "ruby-3.1"
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: [ 'latest', '7.0' ]
+      os: rhel8
+      fle: helper
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+    tasks:
+      - name: "test-fle"
 
   - matrix_name: "fle"
     matrix_spec:

.evergreen/config/axes.yml.erb

@@ -18,6 +18,10 @@ axes:
         variables:
           MONGODB_VERSION: "latest"
           CRYPT_SHARED_VERSION: "latest"
+      - id: "7.0"
+        display_name: "7.0"
+        variables:
+          MONGODB_VERSION: "7.0"
       - id: "6.0"
         display_name: "6.0"
         variables:

.evergreen/config/standard.yml.erb

@@ -41,6 +41,7 @@
   latest_stable_mdb = "6.0".inspect # so it gets quoted as a string
 
   # A few of the most recent MongoDB versions
+  actual_and_upcoming_mdb = %w( latest 7.0 6.0 )
   recent_mdb = %w( 6.0 5.3 )
   latest_5x_mdb = "5.3".inspect # so it gets quoted as a string
 %>
@@ -50,21 +51,21 @@ buildvariants:
     matrix_spec:
       auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
       ruby: <%= latest_ruby %>
-      mongodb-version: <%= latest_stable_mdb %>
+      mongodb-version: <%= actual_and_upcoming_mdb %>
       topology: <%= topologies %>
       os: rhel8
     display_name: ${auth-and-ssl} ${ruby} ${topology}
     tasks:
       - name: "test-mlaunch"
 
-  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
   - matrix_name: "mongo-recent"
     matrix_spec:
       ruby: <%= recent_rubies %>
-      #mongodb-version: ['latest', '6.0']
-      mongodb-version: ['6.0']
+      mongodb-version: <%= actual_and_upcoming_mdb %>
       topology: <%= topologies %>
-      os: ['rhel8', 'ubuntu2204']
+      os: ['rhel8']
+      # There is no latest for ubuntu2204, so we can't test it here.
+      # os: ['rhel8', 'ubuntu2204']
     display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -349,19 +350,17 @@ buildvariants:
     tasks:
       - name: "test-kerberos"
 
-  # 'latest' is broken until the QE2 changes are merged (RUBY-3211, RUBY-3226)
-  #
-  # - matrix_name: "fle-latest"
-  #   matrix_spec:
-  #     auth-and-ssl: "noauth-and-nossl"
-  #     ruby: <%= latest_ruby %>
-  #     topology: [replica-set, sharded-cluster]
-  #     mongodb-version: [ 'latest' ]
-  #     os: rhel8
-  #     fle: helper
-  #   display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
-  #   tasks:
-  #     - name: "test-fle"
+  - matrix_name: "fle-latest"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: <%= latest_ruby %>
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: [ 'latest', '7.0' ]
+      os: rhel8
+      fle: helper
+    display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
+    tasks:
+      - name: "test-fle"
 
   - matrix_name: "fle"
     matrix_spec:

.mod/drivers-evergreen-tools

@@ -15,8 +15,8 @@
     include_context 'with local kms_providers'
 
     before do
-      authorized_client.use(:keyvault)[:datakeys].drop
-      authorized_client.use(:keyvault)[:datakeys].insert_one(data_key)
+      authorized_client.use(:keyvault)[:datakeys, write_concern: { w: :majority }].drop
+      authorized_client.use(:keyvault)[:datakeys, write_concern: { w: :majority }].insert_one(data_key)
       authorized_client.use(:auto_encryption)[:users].drop
       authorized_client.use(:auto_encryption)[:users,
         {

spec/integration/client_update_spec.rb

@@ -192,7 +192,7 @@
     min_server_fcv '3.6'
 
     before do
-      authorized_client['test'].drop
+      authorized_client['test', write_concern: { w: :majority }].drop
     end
 
     context 'when two queries have same read concern' do

spec/integration/query_cache_spec.rb

@@ -17,17 +17,17 @@
   context "Snapshot Query Example 1" do
     before do
       client = authorized_client.use('pets')
-      client['cats'].delete_many
-      client['dogs'].delete_many
+      client['cats', write_concern: { w: :majority }].delete_many
+      client['dogs', write_concern: { w: :majority }].delete_many
 
-      client['cats'].insert_one(
+      client['cats', write_concern: { w: :majority }].insert_one(
         name: "Whiskers",
         color: "white",
         age: 10,
         adoptable: true
       )
 
-      client['dogs'].insert_one(
+      client['dogs', write_concern: { w: :majority }].insert_one(
         name: "Pebbles",
         color: "Brown",
         age: 10,
@@ -75,9 +75,9 @@
 
     before do
       client = authorized_client.use('retail')
-      client['sales'].delete_many
+      client['sales', write_concern: { w: :majority }].delete_many
 
-      client['sales'].insert_one(
+      client['sales', write_concern: { w: :majority }].insert_one(
         shoeType: "boot",
         price: 30,
         saleDate: Time.now

spec/integration/snapshot_query_examples_spec.rb

@@ -373,7 +373,11 @@ def mock_dns(config)
         if $last_async_task.nil?
           STDERR.puts "No async task - server never started?"
         else
-          $last_async_task.stop
+          begin
+            $last_async_task.stop
+          rescue NoMethodError => e
+            STDERR.puts "Error stopping async task: #{e}"
+          end
         end
 
         thread.kill