diff --git a/.evergreen/config.yml b/.evergreen/config.yml index e7a8e93ae0..822ccbc015 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -711,6 +711,12 @@ axes: display_name: "Rapid" variables: MONGODB_VERSION: "rapid" + # 9.0 is not yet GA. drivers-evergreen-tools resolves this to the latest + # nightly build of the server's v9.0 branch (DRIVERS-3610). + - id: "9.0" + display_name: "9.0" + variables: + MONGODB_VERSION: "9.0" - id: "8.2" display_name: "8.2" variables: @@ -886,9 +892,6 @@ axes: - id: ubuntu2004 display_name: "Ubuntu 20.04" run_on: ubuntu2004-small - - id: ubuntu1804 - display_name: "Ubuntu 18.04" - run_on: ubuntu1804-small - id: debian11 display_name: "Debian 11" run_on: debian11-small @@ -1112,7 +1115,7 @@ buildvariants: matrix_spec: auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"] ruby: "ruby-4.0" - mongodb-version: ["8.2", "8.0", "7.0"] + mongodb-version: ["9.0", "8.2", "8.0", "7.0"] topology: ["standalone", "replica-set", "sharded-cluster"] os: ubuntu2204 display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology} @@ -1123,7 +1126,7 @@ buildvariants: - matrix_name: "mongo-recent" matrix_spec: ruby: ["ruby-4.0", "ruby-3.4", "ruby-3.3", "ruby-3.2", "jruby-9.4"] - mongodb-version: ["8.2", "8.0", "7.0"] + mongodb-version: ["9.0", "8.2", "8.0", "7.0"] topology: ["standalone", "replica-set", "sharded-cluster"] os: ubuntu2204 display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}" @@ -1153,12 +1156,16 @@ buildvariants: tasks: - name: "run-main-test-suite" + # 20.04 is the newest host usable here: the 4.4 enterprise archive is not + # published for ubuntu2204. It is also the oldest that still works, since + # drivers-evergreen-tools now requires uv, which needs Python 3.8+ (18.04 + # ships 3.6). - matrix_name: "mongo-4.x" matrix_spec: ruby: ["ruby-3.0", "ruby-2.7"] mongodb-version: ['4.4'] topology: ["standalone", "replica-set", "sharded-cluster"] - os: ubuntu1804 + os: ubuntu2004 display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}" tags: ["pr"] tasks: @@ -1285,7 +1292,7 @@ buildvariants: ruby: "ruby-2.7" mongodb-version: ['4.4'] topology: replica-set - os: ubuntu1804 + os: ubuntu2004 display_name: "${mongodb-version} ${topology} stress ${ruby}" tasks: - name: "test" @@ -1294,7 +1301,7 @@ buildvariants: matrix_spec: stress: on ruby: "ruby-4.0" - mongodb-version: ["8.2", "8.0", "7.0"] + mongodb-version: ["9.0", "8.2", "8.0", "7.0"] topology: replica-set os: ubuntu2204 display_name: "${mongodb-version} ${topology} stress ${ruby}" diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb index 9b305d1570..34a73b9847 100644 --- a/.evergreen/config/axes.yml.erb +++ b/.evergreen/config/axes.yml.erb @@ -6,6 +6,12 @@ axes: display_name: "Rapid" variables: MONGODB_VERSION: "rapid" + # 9.0 is not yet GA. drivers-evergreen-tools resolves this to the latest + # nightly build of the server's v9.0 branch (DRIVERS-3610). + - id: "9.0" + display_name: "9.0" + variables: + MONGODB_VERSION: "9.0" - id: "8.2" display_name: "8.2" variables: @@ -181,9 +187,6 @@ axes: - id: ubuntu2004 display_name: "Ubuntu 20.04" run_on: ubuntu2004-small - - id: ubuntu1804 - display_name: "Ubuntu 18.04" - run_on: ubuntu1804-small - id: debian11 display_name: "Debian 11" run_on: debian11-small diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb index ea1c3d019c..6f50473d59 100644 --- a/.evergreen/config/standard.yml.erb +++ b/.evergreen/config/standard.yml.erb @@ -32,7 +32,7 @@ stable_and_rapid = [ latest_stable_mdb_raw, "rapid" ] - recent_mdb = %w( 8.2 8.0 7.0 ) + recent_mdb = %w( 9.0 8.2 8.0 7.0 ) %> buildvariants: @@ -106,12 +106,16 @@ buildvariants: tasks: - name: "run-main-test-suite" + # 20.04 is the newest host usable here: the 4.4 enterprise archive is not + # published for ubuntu2204. It is also the oldest that still works, since + # drivers-evergreen-tools now requires uv, which needs Python 3.8+ (18.04 + # ships 3.6). - matrix_name: "mongo-4.x" matrix_spec: ruby: <%= older_rubies %> mongodb-version: ['4.4'] topology: <%= topologies %> - os: ubuntu1804 + os: ubuntu2004 display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}" tags: ["pr"] tasks: @@ -238,7 +242,7 @@ buildvariants: ruby: <%= supported_mri_ruby_2 %> mongodb-version: ['4.4'] topology: replica-set - os: ubuntu1804 + os: ubuntu2004 display_name: "${mongodb-version} ${topology} stress ${ruby}" tasks: - name: "test" diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools index 18aed4f176..890a93bdb8 160000 --- a/.mod/drivers-evergreen-tools +++ b/.mod/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit 18aed4f176dab1ed505c9a2a53466ddf3f4796ec +Subproject commit 890a93bdb88c595907813a9bfd0a56156d9f9f5b