From 1f3f7c76655b10803087ba24274bacf7c3468eec Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 20 Jun 2023 16:16:10 -0600 Subject: [PATCH 1/3] let's not run 2.18-stable specs against MDB 7+ --- .evergreen/config.yml | 4 ++-- .evergreen/config/standard.yml.erb | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index cc3dc63305..23b1cb8897 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1063,7 +1063,7 @@ buildvariants: matrix_spec: auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"] ruby: "ruby-3.2" - mongodb-version: ["latest", "7.0", "6.0"] + mongodb-version: "6.0" topology: ["standalone", "replica-set", "sharded-cluster"] os: rhel8 display_name: ${auth-and-ssl} ${ruby} ${topology} @@ -1073,7 +1073,7 @@ buildvariants: - matrix_name: "mongo-recent" matrix_spec: ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.3"] - mongodb-version: ["latest", "7.0", "6.0"] + mongodb-version: "6.0" topology: ["standalone", "replica-set", "sharded-cluster"] os: ['rhel8'] # There is no latest for ubuntu2204, so we can't test it here. diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb index 8e56bcf887..160d6c58de 100644 --- a/.evergreen/config/standard.yml.erb +++ b/.evergreen/config/standard.yml.erb @@ -35,7 +35,6 @@ 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 %> @@ -45,7 +44,7 @@ buildvariants: matrix_spec: auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"] ruby: <%= latest_ruby %> - mongodb-version: <%= actual_and_upcoming_mdb %> + mongodb-version: <%= latest_stable_mdb %> topology: <%= topologies %> os: rhel8 display_name: ${auth-and-ssl} ${ruby} ${topology} @@ -55,7 +54,7 @@ buildvariants: - matrix_name: "mongo-recent" matrix_spec: ruby: <%= recent_rubies %> - mongodb-version: <%= actual_and_upcoming_mdb %> + mongodb-version: <%= latest_stable_mdb %> topology: <%= topologies %> os: ['rhel8'] # There is no latest for ubuntu2204, so we can't test it here. From af2e925e8a9d36a5095ce02c5189a480354875a8 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 20 Jun 2023 16:34:23 -0600 Subject: [PATCH 2/3] Revert "let's not run 2.18-stable specs against MDB 7+" Meant to do this on a branch :/ This reverts commit 1f3f7c76655b10803087ba24274bacf7c3468eec. --- .evergreen/config.yml | 4 ++-- .evergreen/config/standard.yml.erb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 23b1cb8897..cc3dc63305 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1063,7 +1063,7 @@ buildvariants: matrix_spec: auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"] ruby: "ruby-3.2" - 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} @@ -1073,7 +1073,7 @@ buildvariants: - matrix_name: "mongo-recent" matrix_spec: ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.3"] - mongodb-version: "6.0" + mongodb-version: ["latest", "7.0", "6.0"] topology: ["standalone", "replica-set", "sharded-cluster"] os: ['rhel8'] # There is no latest for ubuntu2204, so we can't test it here. diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb index 160d6c58de..8e56bcf887 100644 --- a/.evergreen/config/standard.yml.erb +++ b/.evergreen/config/standard.yml.erb @@ -35,6 +35,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 %> @@ -44,7 +45,7 @@ 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} @@ -54,7 +55,7 @@ buildvariants: - matrix_name: "mongo-recent" matrix_spec: ruby: <%= recent_rubies %> - mongodb-version: <%= latest_stable_mdb %> + mongodb-version: <%= actual_and_upcoming_mdb %> topology: <%= topologies %> os: ['rhel8'] # There is no latest for ubuntu2204, so we can't test it here. From a1c55942c15d3ff6a7d3028dc704614b7d01ccf6 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 13 Jul 2023 11:23:19 -0600 Subject: [PATCH 3/3] bump drivers-evergreen-tools --- .mod/drivers-evergreen-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools index 9186b53aeb..6b328a119f 160000 --- a/.mod/drivers-evergreen-tools +++ b/.mod/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit 9186b53aebe04390d68e348946a4cefc33c6964d +Subproject commit 6b328a119fa0ffdcd13e62b2c1c2259873a9076d