Skip to content

Commit d3a9ca5

Browse files
comandeo-mongocomandeo
comandeo-mongo
and
comandeo
authored
RUBY-3726 Use new toolchain (#2958) (#2960)
--------- Co-authored-by: Dmitry Rybakov <dmitry@rybakov.eu>
1 parent ee03e8f commit d3a9ca5

20 files changed

+279
-145
lines changed

‎.evergreen/config.yml‎

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,25 @@ functions:
168168
169169
EOT
170170
171+
"run CSOT tests":
172+
- command: shell.exec
173+
type: test
174+
params:
175+
shell: bash
176+
working_dir: "src"
177+
script: |
178+
${PREPARE_SHELL}
179+
# Needed for generating temporary aws credentials.
180+
if [ -n "${FLE}" ];
181+
then
182+
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
183+
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
184+
export AWS_DEFAULT_REGION="${fle_aws_region}"
185+
fi
186+
export CSOT_SPEC_TESTS=1
187+
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml" \
188+
.evergreen/run-tests.sh
189+
171190
"export FLE credentials":
172191
- command: shell.exec
173192
type: test
@@ -327,7 +346,7 @@ functions:
327346
"upload test results":
328347
- command: attach.xunit_results
329348
params:
330-
file: ./src/tmp/rspec.xml
349+
file: ./src/tmp/*.xml
331350

332351
"delete private environment":
333352
- command: shell.exec
@@ -463,7 +482,7 @@ post:
463482
# Removed, causing timeouts
464483
# - func: "upload working dir"
465484
- func: "upload mo artifacts"
466-
#- func: "upload test results"
485+
- func: "upload test results"
467486
- func: "upload test results to s3"
468487

469488
task_groups:
@@ -833,11 +852,10 @@ axes:
833852
- id: "mongodb-version"
834853
display_name: MongoDB Version
835854
values:
836-
- id: "latest"
837-
display_name: "latest"
855+
- id: "8.0"
856+
display_name: "8.0"
838857
variables:
839-
MONGODB_VERSION: "latest"
840-
CRYPT_SHARED_VERSION: "latest"
858+
MONGODB_VERSION: "8.0"
841859
- id: "7.0"
842860
display_name: "7.0"
843861
variables:
@@ -962,6 +980,10 @@ axes:
962980
- id: "ruby"
963981
display_name: Ruby Version
964982
values:
983+
- id: "ruby-3.3"
984+
display_name: ruby-3.3
985+
variables:
986+
RVM_RUBY: "ruby-3.3"
965987
- id: "ruby-3.2"
966988
display_name: ruby-3.2
967989
variables:
@@ -1119,7 +1141,7 @@ axes:
11191141
values:
11201142
- id: mmapv1
11211143
display_name: MMAPv1
1122-
run_on: ubuntu1804-small
1144+
run_on: ubuntu2004-small
11231145
variables:
11241146
MMAPV1: 'true'
11251147

@@ -1234,7 +1256,7 @@ buildvariants:
12341256
matrix_spec:
12351257
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
12361258
ruby: "ruby-3.2"
1237-
mongodb-version: ["7.0", "6.0"]
1259+
mongodb-version: ["8.0", "7.0"]
12381260
topology: ["standalone", "replica-set", "sharded-cluster"]
12391261
os: ubuntu2204
12401262
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1244,7 +1266,7 @@ buildvariants:
12441266
- matrix_name: "mongo-recent"
12451267
matrix_spec:
12461268
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
1247-
mongodb-version: ["7.0", "6.0"]
1269+
mongodb-version: ["8.0", "7.0"]
12481270
topology: ["standalone", "replica-set", "sharded-cluster"]
12491271
os: ubuntu2204
12501272
display_name: "${mongodb-version} ${os} ${topology} ${ruby}"
@@ -1254,7 +1276,7 @@ buildvariants:
12541276
- matrix_name: "mongo-recent-arm"
12551277
matrix_spec:
12561278
ruby: "ruby-3.2"
1257-
mongodb-version: ["7.0", "6.0"]
1279+
mongodb-version: ["8.0"]
12581280
topology: ["standalone", "replica-set", "sharded-cluster"]
12591281
os: ubuntu2204-arm
12601282
display_name: "${mongodb-version} ${os} ${topology} ${ruby}"
@@ -1263,28 +1285,18 @@ buildvariants:
12631285

12641286
- matrix_name: "mongo-5.x"
12651287
matrix_spec:
1266-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
1267-
mongodb-version: '5.0'
1288+
ruby: ["ruby-3.3", "ruby-3.2"]
1289+
mongodb-version: ['5.0']
12681290
topology: ["standalone", "replica-set", "sharded-cluster"]
1269-
os: ubuntu1804
1270-
display_name: "${mongodb-version} ${topology} ${ruby}"
1291+
os: ubuntu2004
1292+
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
12711293
tasks:
12721294
- name: "test-mlaunch"
12731295

12741296
- matrix_name: "mongo-4.x"
12751297
matrix_spec:
12761298
ruby: ["ruby-3.0", "ruby-2.7"]
1277-
mongodb-version: ['4.4', '4.2', '4.0']
1278-
topology: ["standalone", "replica-set", "sharded-cluster"]
1279-
os: ubuntu1804
1280-
display_name: "${mongodb-version} ${topology} ${ruby}"
1281-
tasks:
1282-
- name: "test-mlaunch"
1283-
1284-
- matrix_name: "mongo-3.6"
1285-
matrix_spec:
1286-
ruby: "ruby-2.7"
1287-
mongodb-version: ['3.6']
1299+
mongodb-version: ['4.4', '4.2']
12881300
topology: ["standalone", "replica-set", "sharded-cluster"]
12891301
os: ubuntu1804
12901302
display_name: "${mongodb-version} ${topology} ${ruby}"
@@ -1346,17 +1358,6 @@ buildvariants:
13461358
tasks:
13471359
- name: "test-mlaunch"
13481360

1349-
- matrix_name: mmapv1
1350-
matrix_spec:
1351-
ruby: "ruby-2.7"
1352-
mongodb-version: ['3.6', '4.0']
1353-
topology: ["standalone", "replica-set", "sharded-cluster"]
1354-
storage-engine: mmapv1
1355-
os: ubuntu1804
1356-
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
1357-
tasks:
1358-
- name: "test-mlaunch"
1359-
13601361
- matrix_name: "lint"
13611362
matrix_spec:
13621363
lint: on
@@ -1393,8 +1394,8 @@ buildvariants:
13931394
- matrix_name: "stress older"
13941395
matrix_spec:
13951396
stress: on
1396-
ruby: ["ruby-2.7"]
1397-
mongodb-version: ['4.2', '4.0', '3.6']
1397+
ruby: "ruby-2.7"
1398+
mongodb-version: ['4.4', '4.2']
13981399
topology: replica-set
13991400
os: ubuntu1804
14001401
display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1405,7 +1406,7 @@ buildvariants:
14051406
matrix_spec:
14061407
stress: on
14071408
ruby: "ruby-3.2"
1408-
mongodb-version: ["6.0", "5.0"]
1409+
mongodb-version: ["8.0", "7.0"]
14091410
topology: replica-set
14101411
os: ubuntu2004
14111412
display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1437,7 +1438,7 @@ buildvariants:
14371438
- matrix_name: "zlib"
14381439
matrix_spec:
14391440
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1440-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
1441+
ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
14411442
mongodb-version: "7.0"
14421443
topology: "replica-set"
14431444
compressor: 'zlib'
@@ -1449,7 +1450,7 @@ buildvariants:
14491450
- matrix_name: "snappy"
14501451
matrix_spec:
14511452
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1452-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
1453+
ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
14531454
mongodb-version: "7.0"
14541455
topology: "replica-set"
14551456
compressor: 'snappy'
@@ -1465,7 +1466,7 @@ buildvariants:
14651466
- matrix_name: "zstd-auth"
14661467
matrix_spec:
14671468
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
1468-
ruby: ["ruby-3.2", "ruby-2.7"]
1469+
ruby: ["ruby-3.3", "ruby-2.7"]
14691470
mongodb-version: "7.0"
14701471
topology: "replica-set"
14711472
compressor: 'zstd'
@@ -1476,7 +1477,7 @@ buildvariants:
14761477

14771478
- matrix_name: "activesupport"
14781479
matrix_spec:
1479-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
1480+
ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
14801481
mongodb-version: "7.0"
14811482
topology: replica-set
14821483
as: as
@@ -1487,7 +1488,7 @@ buildvariants:
14871488

14881489
- matrix_name: "bson"
14891490
matrix_spec:
1490-
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
1491+
ruby: ["ruby-3.3", "ruby-2.7", "jruby-9.4"]
14911492
mongodb-version: "7.0"
14921493
topology: replica-set
14931494
bson: "*"
@@ -1531,7 +1532,7 @@ buildvariants:
15311532
# enough to install mongosh, and then use either mongo or mongosh
15321533
# (depending on server version and what's available), we can bump this to
15331534
# the latest stable db version.
1534-
mongodb-version: "5.0"
1535+
mongodb-version: '5.0'
15351536
os: ubuntu2004
15361537
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
15371538
tasks:
@@ -1554,7 +1555,7 @@ buildvariants:
15541555
ocsp-algorithm: ecdsa
15551556
ocsp-must-staple: on
15561557
ocsp-delegate: on
1557-
ruby: ["ruby-3.2", "ruby-2.7"]
1558+
ruby: ["ruby-3.3", "ruby-2.7"]
15581559
topology: standalone
15591560
mongodb-version: "7.0"
15601561
os: ubuntu2004
@@ -1567,7 +1568,7 @@ buildvariants:
15671568
matrix_spec:
15681569
ocsp-algorithm: rsa
15691570
ocsp-status: unknown
1570-
ruby: ["ruby-3.2", "ruby-2.7"]
1571+
ruby: ["ruby-3.3", "ruby-2.7"]
15711572
topology: standalone
15721573
mongodb-version: "7.0"
15731574
os: ubuntu2004
@@ -1583,7 +1584,7 @@ buildvariants:
15831584
ocsp-delegate: '*'
15841585
ocsp-connectivity: pass
15851586
extra-uri-options: "none"
1586-
ruby: ["ruby-3.2", "ruby-2.7"]
1587+
ruby: ["ruby-3.3", "ruby-2.7"]
15871588
topology: standalone
15881589
mongodb-version: "7.0"
15891590
os: ubuntu2004
@@ -1597,7 +1598,7 @@ buildvariants:
15971598
ocsp-delegate: '*'
15981599
ocsp-connectivity: pass
15991600
extra-uri-options: "none"
1600-
ruby: ["ruby-3.2", "ruby-2.7"]
1601+
ruby: ["ruby-3.3", "ruby-2.7"]
16011602
topology: standalone
16021603
mongodb-version: "7.0"
16031604
os: ubuntu2004
@@ -1611,7 +1612,7 @@ buildvariants:
16111612
ocsp-delegate: '*'
16121613
ocsp-connectivity: fail
16131614
extra-uri-options: "none"
1614-
ruby: ["ruby-3.2", "ruby-2.7"]
1615+
ruby: ["ruby-3.3", "ruby-2.7"]
16151616
topology: standalone
16161617
mongodb-version: "7.0"
16171618
os: ubuntu2004
@@ -1625,7 +1626,7 @@ buildvariants:
16251626
ocsp-delegate: '*'
16261627
ocsp-connectivity: pass
16271628
extra-uri-options: "tlsInsecure=true"
1628-
ruby: ["ruby-3.2", "ruby-2.7"]
1629+
ruby: ["ruby-3.3", "ruby-2.7"]
16291630
topology: standalone
16301631
mongodb-version: "7.0"
16311632
os: ubuntu2004
@@ -1639,7 +1640,7 @@ buildvariants:
16391640
ocsp-delegate: '*'
16401641
ocsp-connectivity: pass
16411642
extra-uri-options: "tlsInsecure=true"
1642-
ruby: ["ruby-3.2", "ruby-2.7"]
1643+
ruby: ["ruby-3.3", "ruby-2.7"]
16431644
topology: standalone
16441645
mongodb-version: "7.0"
16451646
os: ubuntu2004
@@ -1653,7 +1654,7 @@ buildvariants:
16531654
ocsp-delegate: '*'
16541655
ocsp-connectivity: pass
16551656
extra-uri-options: "tlsInsecure=true"
1656-
ruby: ["ruby-3.2", "ruby-2.7"]
1657+
ruby: ["ruby-3.3", "ruby-2.7"]
16571658
topology: standalone
16581659
mongodb-version: "7.0"
16591660
os: ubuntu2004
@@ -1667,7 +1668,7 @@ buildvariants:
16671668
ocsp-delegate: '*'
16681669
ocsp-connectivity: pass
16691670
extra-uri-options: "tlsAllowInvalidCertificates=true"
1670-
ruby: ["ruby-3.2", "ruby-2.7"]
1671+
ruby: ["ruby-3.3", "ruby-2.7"]
16711672
topology: standalone
16721673
mongodb-version: "7.0"
16731674
os: ubuntu2004
@@ -1681,7 +1682,7 @@ buildvariants:
16811682
ocsp-delegate: '*'
16821683
ocsp-connectivity: pass
16831684
extra-uri-options: "tlsAllowInvalidCertificates=true"
1684-
ruby: ["ruby-3.2", "ruby-2.7"]
1685+
ruby: ["ruby-3.3", "ruby-2.7"]
16851686
topology: standalone
16861687
mongodb-version: "7.0"
16871688
os: ubuntu2004
@@ -1695,7 +1696,7 @@ buildvariants:
16951696
ocsp-delegate: '*'
16961697
ocsp-connectivity: pass
16971698
extra-uri-options: "tlsAllowInvalidCertificates=true"
1698-
ruby: ["ruby-3.2", "ruby-2.7"]
1699+
ruby: ["ruby-3.3", "ruby-2.7"]
16991700
topology: standalone
17001701
mongodb-version: "7.0"
17011702
os: ubuntu2004
@@ -1763,10 +1764,11 @@ buildvariants:
17631764
tasks:
17641765
- name: testatlas_task_group
17651766

1766-
- matrix_name: "aws-lambda"
1767-
matrix_spec:
1768-
ruby: 'ruby-3.2'
1769-
os: ubuntu2204
1770-
display_name: "AWS Lambda"
1771-
tasks:
1772-
- name: test_aws_lambda_task_group
1767+
# https://jira.mongodb.org/browse/RUBY-3311
1768+
# - matrix_name: "aws-lambda"
1769+
# matrix_spec:
1770+
# ruby: 'ruby-3.2'
1771+
# os: ubuntu2204
1772+
# display_name: "AWS Lambda"
1773+
# tasks:
1774+
# - name: test_aws_lambda_task_group

‎.evergreen/config/axes.yml.erb‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ axes:
1313
- id: "mongodb-version"
1414
display_name: MongoDB Version
1515
values:
16-
- id: "latest"
17-
display_name: "latest"
16+
- id: "8.0"
17+
display_name: "8.0"
1818
variables:
19-
MONGODB_VERSION: "latest"
20-
CRYPT_SHARED_VERSION: "latest"
19+
MONGODB_VERSION: "8.0"
2120
- id: "7.0"
2221
display_name: "7.0"
2322
variables:
@@ -142,6 +141,10 @@ axes:
142141
- id: "ruby"
143142
display_name: Ruby Version
144143
values:
144+
- id: "ruby-3.3"
145+
display_name: ruby-3.3
146+
variables:
147+
RVM_RUBY: "ruby-3.3"
145148
- id: "ruby-3.2"
146149
display_name: ruby-3.2
147150
variables:
@@ -297,7 +300,7 @@ axes:
297300
values:
298301
- id: mmapv1
299302
display_name: MMAPv1
300-
run_on: ubuntu1804-small
303+
run_on: ubuntu2004-small
301304
variables:
302305
MMAPV1: 'true'
303306

0 commit comments

Comments
 (0)