Skip to content

Commit fea5824

Browse files
Update variants
1 parent a95f4a3 commit fea5824

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -761,11 +761,6 @@ axes:
761761
- id: "mongodb-version"
762762
display_name: MongoDB Version
763763
values:
764-
- id: "latest"
765-
display_name: "latest"
766-
variables:
767-
MONGODB_VERSION: "latest"
768-
CRYPT_SHARED_VERSION: "latest"
769764
- id: "8.0"
770765
display_name: "8.0"
771766
variables:
@@ -1061,7 +1056,7 @@ axes:
10611056
values:
10621057
- id: mmapv1
10631058
display_name: MMAPv1
1064-
run_on: ubuntu1804-small
1059+
run_on: ubuntu2004-small
10651060
variables:
10661061
MMAPV1: 'true'
10671062

@@ -1176,7 +1171,7 @@ buildvariants:
11761171
matrix_spec:
11771172
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
11781173
ruby: "ruby-3.3"
1179-
mongodb-version: ["latest", "8.0", "7.0"]
1174+
mongodb-version: ["8.0", "7.0"]
11801175
topology: ["standalone", "replica-set", "sharded-cluster"]
11811176
os: ubuntu2204
11821177
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1186,7 +1181,7 @@ buildvariants:
11861181
- matrix_name: "mongo-recent"
11871182
matrix_spec:
11881183
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
1189-
mongodb-version: ["latest", "8.0", "7.0"]
1184+
mongodb-version: ["8.0", "7.0"]
11901185
topology: ["standalone", "replica-set", "sharded-cluster"]
11911186
os: ubuntu2204
11921187
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"

.evergreen/config/axes.yml.erb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ axes:
1313
- id: "mongodb-version"
1414
display_name: MongoDB Version
1515
values:
16-
- id: "latest"
17-
display_name: "latest"
18-
variables:
19-
MONGODB_VERSION: "latest"
20-
CRYPT_SHARED_VERSION: "latest"
2116
- id: "8.0"
2217
display_name: "8.0"
2318
variables:
@@ -311,7 +306,7 @@ axes:
311306
values:
312307
- id: mmapv1
313308
display_name: MMAPv1
314-
run_on: ubuntu1804-small
309+
run_on: ubuntu2004-small
315310
variables:
316311
MMAPV1: 'true'
317312

.evergreen/config/standard.yml.erb

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# these are used for testing against a few recent ruby versions
99
recent_rubies = %w( ruby-3.3 ruby-3.2 jruby-9.4 )
1010

11-
# this is a list of the most most recent 3.x and 2.x MRI ruby versions
11+
# this is a list of the most recent 3.x and 2.x MRI ruby versions
1212
sample_mri_rubies = %w( ruby-3.3 ruby-2.7 )
1313

1414
# as above, but including the most recent JRuby release
@@ -33,12 +33,8 @@
3333
# The latest stable version of MongoDB
3434
latest_stable_mdb = "8.0".inspect # so it gets quoted as a string
3535

36-
# A few of the most recent MongoDB versions
37-
actual_and_upcoming_mdb = %w( latest 8.0 7.0 )
3836

3937
recent_mdb = %w( 8.0 7.0 )
40-
41-
all_dbs = %w(latest 8.0 7.0 6.0 5.0 4.4 4.2 4.0 3.6)
4238
%>
4339

4440
buildvariants:
@@ -56,7 +52,7 @@ buildvariants:
5652
matrix_spec:
5753
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
5854
ruby: <%= latest_ruby %>
59-
mongodb-version: <%= actual_and_upcoming_mdb %>
55+
mongodb-version: <%= recent_mdb %>
6056
topology: <%= topologies %>
6157
os: ubuntu2204
6258
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -66,7 +62,7 @@ buildvariants:
6662
- matrix_name: "mongo-recent"
6763
matrix_spec:
6864
ruby: <%= recent_rubies %>
69-
mongodb-version: <%= actual_and_upcoming_mdb %>
65+
mongodb-version: <%= recent_mdb %>
7066
topology: <%= topologies %>
7167
os: ubuntu2204
7268
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -96,7 +92,7 @@ buildvariants:
9692
- matrix_name: "mongo-4.x"
9793
matrix_spec:
9894
ruby: <%= older_rubies %>
99-
mongodb-version: ['4.4', '4.2', '4.0']
95+
mongodb-version: ['4.4', '4.0']
10096
topology: <%= topologies %>
10197
os: ubuntu2004
10298
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -226,7 +222,7 @@ buildvariants:
226222
matrix_spec:
227223
stress: on
228224
ruby: <%= supported_mri_ruby_2 %>
229-
mongodb-version: ['4.2', '4.0', '3.6']
225+
mongodb-version: ['4.4', '4.0', '3.6']
230226
topology: replica-set
231227
os: ubuntu2004
232228
display_name: "${mongodb-version} ${topology} stress ${ruby}"

0 commit comments

Comments
 (0)