@@ -59,7 +59,7 @@ buildvariants:
59
59
- matrix_name: "mongo-4.4"
60
60
matrix_spec:
61
61
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
62
- ruby: ["ruby-3.0", "ruby-2.7"]
62
+ ruby: ["ruby-3.1", "ruby-3. 0", "ruby-2.7"]
63
63
mongodb-version: '4.4'
64
64
topology: <%= tt %>
65
65
os: ubuntu1604
@@ -161,7 +161,7 @@ buildvariants:
161
161
- matrix_name: "fork"
162
162
matrix_spec:
163
163
fork: on
164
- ruby: ["ruby-3.0", "ruby-2.7"]
164
+ ruby: ["ruby-3.1", "ruby-3. 0", "ruby-2.7"]
165
165
mongodb-version: ["4.4"]
166
166
topology: <%= tt %>
167
167
os: ubuntu1604
@@ -172,7 +172,7 @@ buildvariants:
172
172
- matrix_name: "solo"
173
173
matrix_spec:
174
174
solo: on
175
- ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
175
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
176
176
mongodb-version: ["4.4"]
177
177
topology: <%= tt %>
178
178
os: ubuntu1604
@@ -227,19 +227,7 @@ buildvariants:
227
227
- matrix_name: "zlib-auth"
228
228
matrix_spec:
229
229
auth-and-ssl: "auth-and-ssl"
230
- ruby: ["ruby-2.7"]
231
- mongodb-version: "4.4"
232
- topology: "replica-set"
233
- compressor: 'zlib'
234
- os: ubuntu1604
235
- display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
236
- tasks:
237
- - name: "test-mlaunch"
238
-
239
- - matrix_name: "zlib-auth-3.0"
240
- matrix_spec:
241
- auth-and-ssl: "auth-and-ssl"
242
- ruby: ["ruby-3.0"]
230
+ ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7"]
243
231
mongodb-version: "4.4"
244
232
topology: "standalone"
245
233
compressor: 'zlib'
@@ -263,7 +251,7 @@ buildvariants:
263
251
- matrix_name: "snappy-auth"
264
252
matrix_spec:
265
253
auth-and-ssl: "auth-and-ssl"
266
- ruby: ["ruby-2.7"]
254
+ ruby: ["ruby-3.1", "ruby-3.0", "ruby- 2.7"]
267
255
mongodb-version: "4.4"
268
256
topology: "replica-set"
269
257
compressor: 'snappy'
@@ -272,24 +260,12 @@ buildvariants:
272
260
tasks:
273
261
- name: "test-mlaunch"
274
262
275
- - matrix_name: "snappy-auth-3.0"
276
- matrix_spec:
277
- auth-and-ssl: "auth-and-ssl"
278
- ruby: ["ruby-3.0"]
279
- mongodb-version: "4.4"
280
- topology: "standalone"
281
- compressor: 'snappy'
282
- os: ubuntu1604
283
- display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
284
- tasks:
285
- - name: "test-mlaunch"
286
-
287
263
- matrix_name: "snappy-noauth"
288
264
matrix_spec:
289
265
auth-and-ssl: "noauth-and-nossl"
290
266
ruby: "ruby-2.5"
291
267
mongodb-version: ["3.6"]
292
- topology: replica-set
268
+ topology: standalone
293
269
compressor: 'snappy'
294
270
os: ubuntu1604
295
271
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -312,7 +288,7 @@ buildvariants:
312
288
- matrix_name: "zstd-auth"
313
289
matrix_spec:
314
290
auth-and-ssl: "auth-and-ssl"
315
- ruby: ["ruby-2.7"]
291
+ ruby: ["ruby-3.1", "ruby-3.0", "ruby- 2.7"]
316
292
mongodb-version: "4.4"
317
293
topology: "replica-set"
318
294
compressor: 'zstd'
@@ -321,18 +297,6 @@ buildvariants:
321
297
tasks:
322
298
- name: "test-mlaunch"
323
299
324
- - matrix_name: "zstd-auth-3.0"
325
- matrix_spec:
326
- auth-and-ssl: "auth-and-ssl"
327
- ruby: ["ruby-3.0"]
328
- mongodb-version: "4.4"
329
- topology: "standalone"
330
- compressor: 'zstd'
331
- os: ubuntu1604
332
- display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
333
- tasks:
334
- - name: "test-mlaunch"
335
-
336
300
- matrix_name: "zstd-noauth"
337
301
matrix_spec:
338
302
auth-and-ssl: "noauth-and-nossl"
@@ -369,7 +333,7 @@ buildvariants:
369
333
370
334
- matrix_name: "activesupport"
371
335
matrix_spec:
372
- ruby: ["ruby-3.0", "ruby-2.7"]
336
+ ruby: ["ruby-3.1", "ruby-3. 0", "ruby-2.7"]
373
337
mongodb-version: '4.4'
374
338
topology: replica-set
375
339
as: as
@@ -380,7 +344,7 @@ buildvariants:
380
344
381
345
- matrix_name: "bson"
382
346
matrix_spec:
383
- ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
347
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7, jruby-9.2]
384
348
mongodb-version: '4.4'
385
349
topology: replica-set
386
350
bson: "*"
@@ -438,8 +402,8 @@ buildvariants:
438
402
matrix_spec:
439
403
auth-and-ssl: "noauth-and-nossl"
440
404
# https://jira.mongodb.org/browse/RUBY-2832
441
- # ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
442
- ruby: [ruby-3.0, ruby-2.7]
405
+ # ruby: [ruby-3.1, ruby-3. 0, ruby-2.7, jruby-9.2]
406
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7]
443
407
topology: standalone
444
408
mongodb-version: ['4.4']
445
409
os: ubuntu1804
@@ -495,13 +459,13 @@ buildvariants:
495
459
- name: "test-aws-auth"
496
460
497
461
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
498
- # TODO Add ruby-3.0: RUBY-2717
462
+ # TODO Add ruby-3.1, ruby-3. 0: RUBY-2717
499
463
<%|= standard_debian_rubies(%w(ruby-2.5 ruby-2.6 ruby-2.7), key: 'docker-distro') do %>
500
464
matrix_name: ocsp-verifier
501
465
matrix_spec:
502
466
ocsp-verifier: true
503
467
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
504
- ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5]
468
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7, ruby-2.6, ruby-2.5]
505
469
topology: standalone
506
470
mongodb-version: '4.4'
507
471
os: ubuntu1604
@@ -515,7 +479,7 @@ buildvariants:
515
479
ocsp-algorithm: ecdsa
516
480
ocsp-must-staple: on
517
481
ocsp-delegate: on
518
- ruby: [ruby-3.0, ruby-2.7]
482
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7]
519
483
topology: standalone
520
484
mongodb-version: '4.4'
521
485
os: ubuntu1604
@@ -528,7 +492,7 @@ buildvariants:
528
492
matrix_spec:
529
493
ocsp-algorithm: rsa
530
494
ocsp-status: unknown
531
- ruby: [ruby-3.0, ruby-2.7]
495
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7]
532
496
topology: standalone
533
497
mongodb-version: '4.4'
534
498
os: ubuntu1604
@@ -558,7 +522,7 @@ buildvariants:
558
522
ocsp-delegate: '*'
559
523
ocsp-connectivity: <%= outcome %>
560
524
extra-uri-options: "<%= extra_uri_options %> "
561
- ruby: [ruby-3.0, ruby-2.7]
525
+ ruby: [ruby-3.1, ruby-3. 0, ruby-2.7]
562
526
topology: standalone
563
527
mongodb-version: '4.4'
564
528
os: ubuntu1604
0 commit comments