Skip to content

Commit 9cecf34

Browse files
comandeo-mongocomandeo-mongo
authored
Fix failing specs (#2929)
1 parent 065a928 commit 9cecf34

File tree

6 files changed

+249
-265
lines changed

6 files changed

+249
-265
lines changed

‎.evergreen/config.yml‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ buildvariants:
13171317
- matrix_name: DriverBench
13181318
matrix_spec:
13191319
ruby: "ruby-3.3"
1320-
mongodb-version: "7.0"
1320+
mongodb-version: "8.0"
13211321
topology: standalone
13221322
os: ubuntu2204
13231323
display_name: DriverBench
@@ -1388,7 +1388,7 @@ buildvariants:
13881388
- matrix_name: "single-lb"
13891389
matrix_spec:
13901390
ruby: "ruby-3.3"
1391-
mongodb-version: "7.0"
1391+
mongodb-version: "8.0"
13921392
topology: load-balanced
13931393
single-mongos: single-mongos
13941394
os: ubuntu2204
@@ -1410,7 +1410,7 @@ buildvariants:
14101410
- matrix_name: "single-mongos"
14111411
matrix_spec:
14121412
ruby: "ruby-3.3"
1413-
mongodb-version: "7.0"
1413+
mongodb-version: "8.0"
14141414
topology: "sharded-cluster"
14151415
single-mongos: single-mongos
14161416
os: ubuntu2204
@@ -1421,7 +1421,7 @@ buildvariants:
14211421
- matrix_name: CSOT
14221422
matrix_spec:
14231423
ruby: "ruby-3.3"
1424-
mongodb-version: "7.0"
1424+
mongodb-version: "8.0"
14251425
topology: replica-set-single-node
14261426
os: ubuntu2204
14271427
display_name: "CSOT - ${mongodb-version}"
@@ -1432,7 +1432,7 @@ buildvariants:
14321432
matrix_spec:
14331433
retry-reads: no-retry-reads
14341434
ruby: "ruby-3.3"
1435-
mongodb-version: "7.0"
1435+
mongodb-version: "8.0"
14361436
topology: ["standalone", "replica-set", "sharded-cluster"]
14371437
os: ubuntu2204
14381438
display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
@@ -1443,7 +1443,7 @@ buildvariants:
14431443
matrix_spec:
14441444
retry-writes: no-retry-writes
14451445
ruby: "ruby-3.3"
1446-
mongodb-version: "7.0"
1446+
mongodb-version: "8.0"
14471447
topology: [replica-set, sharded-cluster]
14481448
os: ubuntu2204
14491449
display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
@@ -1465,7 +1465,7 @@ buildvariants:
14651465
matrix_spec:
14661466
lint: on
14671467
ruby: "ruby-3.3"
1468-
mongodb-version: "7.0"
1468+
mongodb-version: "8.0"
14691469
topology: ["standalone", "replica-set", "sharded-cluster"]
14701470
os: ubuntu2204
14711471
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
@@ -1476,7 +1476,7 @@ buildvariants:
14761476
matrix_spec:
14771477
fork: on
14781478
ruby: "ruby-3.3"
1479-
mongodb-version: "7.0"
1479+
mongodb-version: "8.0"
14801480
topology: ["standalone", "replica-set", "sharded-cluster"]
14811481
os: ubuntu2204
14821482
display_name: "${mongodb-version} ${topology} fork ${ruby}"
@@ -1487,7 +1487,7 @@ buildvariants:
14871487
matrix_spec:
14881488
solo: on
14891489
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
1490-
mongodb-version: "7.0"
1490+
mongodb-version: "8.0"
14911491
topology: ["standalone", "replica-set", "sharded-cluster"]
14921492
os: ubuntu2204
14931493
display_name: "${mongodb-version} ${topology} solo ${ruby}"
@@ -1520,7 +1520,7 @@ buildvariants:
15201520
matrix_spec:
15211521
auth-and-ssl: "x509"
15221522
ruby: "ruby-3.3"
1523-
mongodb-version: "7.0"
1523+
mongodb-version: "8.0"
15241524
topology: standalone
15251525
os: ubuntu2204
15261526
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1531,7 +1531,7 @@ buildvariants:
15311531
matrix_spec:
15321532
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
15331533
ruby: jruby-9.4
1534-
mongodb-version: "7.0"
1534+
mongodb-version: "8.0"
15351535
topology: ["standalone", "replica-set", "sharded-cluster"]
15361536
os: ubuntu2204
15371537
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1542,7 +1542,7 @@ buildvariants:
15421542
matrix_spec:
15431543
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
15441544
ruby: "ruby-3.3"
1545-
mongodb-version: "7.0"
1545+
mongodb-version: "8.0"
15461546
topology: "replica-set"
15471547
compressor: 'zlib'
15481548
os: ubuntu2204
@@ -1554,7 +1554,7 @@ buildvariants:
15541554
matrix_spec:
15551555
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
15561556
ruby: "ruby-3.3"
1557-
mongodb-version: "7.0"
1557+
mongodb-version: "8.0"
15581558
topology: "replica-set"
15591559
compressor: 'snappy'
15601560
os: ubuntu2204
@@ -1570,7 +1570,7 @@ buildvariants:
15701570
matrix_spec:
15711571
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
15721572
ruby: "ruby-3.3"
1573-
mongodb-version: "7.0"
1573+
mongodb-version: "8.0"
15741574
topology: "replica-set"
15751575
compressor: 'zstd'
15761576
os: ubuntu2204
@@ -1581,7 +1581,7 @@ buildvariants:
15811581
- matrix_name: activesupport-"ruby-3.3"
15821582
matrix_spec:
15831583
ruby: "ruby-3.3"
1584-
mongodb-version: "7.0"
1584+
mongodb-version: "8.0"
15851585
topology: replica-set
15861586
as: as
15871587
os: ubuntu2204
@@ -1592,7 +1592,7 @@ buildvariants:
15921592
- matrix_name: bson-"ruby-3.3"
15931593
matrix_spec:
15941594
ruby: "ruby-3.3"
1595-
mongodb-version: "7.0"
1595+
mongodb-version: "8.0"
15961596
topology: replica-set
15971597
bson: "*"
15981598
os: ubuntu2204
@@ -1684,34 +1684,36 @@ buildvariants:
16841684
- matrix_name: "kerberos-unit"
16851685
matrix_spec:
16861686
ruby: "ruby-3.3"
1687-
mongodb-version: "7.0"
1687+
mongodb-version: "8.0"
16881688
topology: standalone
16891689
os: ubuntu2204
16901690
auth-and-ssl: kerberos
16911691
display_name: "Kerberos Tests"
16921692
tasks:
16931693
- name: "test-kerberos"
16941694

1695-
- matrix_name: "fle-latest"
1696-
matrix_spec:
1697-
auth-and-ssl: "noauth-and-nossl"
1698-
ruby: "ruby-3.3"
1699-
topology: [replica-set, sharded-cluster]
1700-
mongodb-version: [ 'latest' ]
1701-
os: ubuntu2204
1702-
fle: helper
1703-
display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
1704-
tasks:
1705-
- name: "test-fle"
1695+
# - matrix_name: "fle-latest"
1696+
# matrix_spec:
1697+
# auth-and-ssl: "noauth-and-nossl"
1698+
# ruby:
1699+
# topology: [replica-set, sharded-cluster]
1700+
# mongodb-version: [ 'latest' ]
1701+
# os: ubuntu2204
1702+
# fle: helper
1703+
# display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
1704+
# tasks:
1705+
# - name: "test-fle"
17061706

17071707
- matrix_name: aws-auth-regular
17081708
matrix_spec:
17091709
# https://jira.mongodb.org/browse/RUBY-3311
17101710
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
1711-
auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
1711+
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
1712+
# https://jira.mongodb.org/browse/RUBY-3659
1713+
auth-and-ssl: [ aws-regular, aws-assume-role, aws-web-identity ]
17121714
ruby: "ruby-3.3"
17131715
topology: standalone
1714-
mongodb-version: "7.0"
1716+
mongodb-version: "8.0"
17151717
os: ubuntu2204
17161718
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
17171719
tasks:
@@ -1723,7 +1725,7 @@ buildvariants:
17231725
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
17241726
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
17251727
topology: standalone
1726-
mongodb-version: "7.0"
1728+
mongodb-version: "8.0"
17271729
os: ubuntu2204
17281730
display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
17291731
tasks:
@@ -1736,7 +1738,7 @@ buildvariants:
17361738
ocsp-delegate: on
17371739
ruby: "ruby-3.3"
17381740
topology: standalone
1739-
mongodb-version: "7.0"
1741+
mongodb-version: "8.0"
17401742
os: ubuntu2204
17411743
auth-and-ssl: noauth-and-ssl
17421744
display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
@@ -1749,7 +1751,7 @@ buildvariants:
17491751
ocsp-status: unknown
17501752
ruby: "ruby-3.3"
17511753
topology: standalone
1752-
mongodb-version: "7.0"
1754+
mongodb-version: "8.0"
17531755
os: ubuntu2204
17541756
auth-and-ssl: noauth-and-ssl
17551757
display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
@@ -1765,7 +1767,7 @@ buildvariants:
17651767
extra-uri-options: "none"
17661768
ruby: "ruby-3.3"
17671769
topology: standalone
1768-
mongodb-version: "7.0"
1770+
mongodb-version: "8.0"
17691771
os: ubuntu2204
17701772
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17711773
tasks:
@@ -1779,7 +1781,7 @@ buildvariants:
17791781
extra-uri-options: "none"
17801782
ruby: "ruby-3.3"
17811783
topology: standalone
1782-
mongodb-version: "7.0"
1784+
mongodb-version: "8.0"
17831785
os: ubuntu2204
17841786
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17851787
tasks:
@@ -1793,7 +1795,7 @@ buildvariants:
17931795
extra-uri-options: "none"
17941796
ruby: "ruby-3.3"
17951797
topology: standalone
1796-
mongodb-version: "7.0"
1798+
mongodb-version: "8.0"
17971799
os: ubuntu2204
17981800
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17991801
tasks:
@@ -1807,7 +1809,7 @@ buildvariants:
18071809
extra-uri-options: "tlsInsecure=true"
18081810
ruby: "ruby-3.3"
18091811
topology: standalone
1810-
mongodb-version: "7.0"
1812+
mongodb-version: "8.0"
18111813
os: ubuntu2204
18121814
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18131815
tasks:
@@ -1821,7 +1823,7 @@ buildvariants:
18211823
extra-uri-options: "tlsInsecure=true"
18221824
ruby: "ruby-3.3"
18231825
topology: standalone
1824-
mongodb-version: "7.0"
1826+
mongodb-version: "8.0"
18251827
os: ubuntu2204
18261828
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18271829
tasks:
@@ -1835,7 +1837,7 @@ buildvariants:
18351837
extra-uri-options: "tlsInsecure=true"
18361838
ruby: "ruby-3.3"
18371839
topology: standalone
1838-
mongodb-version: "7.0"
1840+
mongodb-version: "8.0"
18391841
os: ubuntu2204
18401842
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18411843
tasks:
@@ -1849,7 +1851,7 @@ buildvariants:
18491851
extra-uri-options: "tlsAllowInvalidCertificates=true"
18501852
ruby: "ruby-3.3"
18511853
topology: standalone
1852-
mongodb-version: "7.0"
1854+
mongodb-version: "8.0"
18531855
os: ubuntu2204
18541856
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18551857
tasks:
@@ -1863,7 +1865,7 @@ buildvariants:
18631865
extra-uri-options: "tlsAllowInvalidCertificates=true"
18641866
ruby: "ruby-3.3"
18651867
topology: standalone
1866-
mongodb-version: "7.0"
1868+
mongodb-version: "8.0"
18671869
os: ubuntu2204
18681870
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18691871
tasks:
@@ -1877,7 +1879,7 @@ buildvariants:
18771879
extra-uri-options: "tlsAllowInvalidCertificates=true"
18781880
ruby: "ruby-3.3"
18791881
topology: standalone
1880-
mongodb-version: "7.0"
1882+
mongodb-version: "8.0"
18811883
os: ubuntu2204
18821884
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
18831885
tasks:
@@ -1897,7 +1899,7 @@ buildvariants:
18971899
ocsp-connectivity: pass
18981900
ruby: jruby-9.4
18991901
topology: standalone
1900-
mongodb-version: "7.0"
1902+
mongodb-version: "8.0"
19011903
os: ubuntu2204
19021904
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
19031905
tasks:
@@ -1910,7 +1912,7 @@ buildvariants:
19101912
# fle: helper
19111913
# topology: standalone
19121914
# os: ubuntu2204
1913-
# mongodb-version: "7.0"
1915+
# mongodb-version: "8.0"
19141916
# display_name: "GCP KMS"
19151917
# tasks:
19161918
# - name: testgcpkms_task_group

‎.evergreen/config/standard.yml.erb‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
jrubies
3232

3333
# The latest stable version of MongoDB
34-
latest_stable_mdb = "7.0".inspect # so it gets quoted as a string
34+
latest_stable_mdb = "8.0".inspect # so it gets quoted as a string
3535

3636
# A few of the most recent MongoDB versions
3737
actual_and_upcoming_mdb = %w( latest 8.0 7.0 )
@@ -365,23 +365,25 @@ buildvariants:
365365
tasks:
366366
- name: "test-kerberos"
367367

368-
- matrix_name: "fle-latest"
369-
matrix_spec:
370-
auth-and-ssl: "noauth-and-nossl"
371-
ruby: <%= latest_ruby %>
372-
topology: [replica-set, sharded-cluster]
373-
mongodb-version: [ 'latest' ]
374-
os: ubuntu2204
375-
fle: helper
376-
display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
377-
tasks:
378-
- name: "test-fle"
368+
# - matrix_name: "fle-latest"
369+
# matrix_spec:
370+
# auth-and-ssl: "noauth-and-nossl"
371+
# ruby: <%#= latest_ruby %>
372+
# topology: [replica-set, sharded-cluster]
373+
# mongodb-version: [ 'latest' ]
374+
# os: ubuntu2204
375+
# fle: helper
376+
# display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
377+
# tasks:
378+
# - name: "test-fle"
379379

380380
- matrix_name: aws-auth-regular
381381
matrix_spec:
382382
# https://jira.mongodb.org/browse/RUBY-3311
383383
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
384-
auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
384+
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
385+
# https://jira.mongodb.org/browse/RUBY-3659
386+
auth-and-ssl: [ aws-regular, aws-assume-role, aws-web-identity ]
385387
ruby: <%= latest_ruby %>
386388
topology: standalone
387389
mongodb-version: <%= latest_stable_mdb %>

‎spec/shared‎

0 commit comments

Comments
 (0)