@@ -1295,14 +1295,10 @@ buildvariants:
12951295 # Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
12961296 # issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
12971297 # and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
1298- #
1299- # further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
1300- # RUBY-3226)
13011298 - matrix_name : " mongo-recent-arm"
13021299 matrix_spec :
13031300 ruby : " ruby-3.2"
1304- # mongodb-version: ['latest', '6.0']
1305- mongodb-version : ['6.0']
1301+ mongodb-version : ["latest", "7.0", "6.0"]
13061302 topology : ["standalone", "replica-set", "sharded-cluster"]
13071303 os : ' rhel8-arm'
13081304 display_name : " ${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1342,7 +1338,7 @@ buildvariants:
13421338 - matrix_name : " single-lb"
13431339 matrix_spec :
13441340 ruby : " ruby-3.2"
1345- mongodb-version : " 6 .0"
1341+ mongodb-version : " 7 .0"
13461342 topology : load-balanced
13471343 single-mongos : single-mongos
13481344 os : rhel8
@@ -1364,7 +1360,7 @@ buildvariants:
13641360 - matrix_name : " single-mongos"
13651361 matrix_spec :
13661362 ruby : " ruby-3.2"
1367- mongodb-version : " 6 .0"
1363+ mongodb-version : " 7 .0"
13681364 topology : " sharded-cluster"
13691365 single-mongos : single-mongos
13701366 os : rhel8
@@ -1376,7 +1372,7 @@ buildvariants:
13761372 matrix_spec :
13771373 retry-reads : no-retry-reads
13781374 ruby : " ruby-3.2"
1379- mongodb-version : " 6 .0"
1375+ mongodb-version : " 7 .0"
13801376 topology : ["standalone", "replica-set", "sharded-cluster"]
13811377 os : rhel8
13821378 display_name : " ${mongodb-version} ${topology} ${retry-reads} ${ruby}"
@@ -1387,7 +1383,7 @@ buildvariants:
13871383 matrix_spec :
13881384 retry-writes : no-retry-writes
13891385 ruby : " ruby-3.2"
1390- mongodb-version : " 6 .0"
1386+ mongodb-version : " 7 .0"
13911387 topology : [replica-set, sharded-cluster]
13921388 os : rhel8
13931389 display_name : " ${mongodb-version} ${topology} ${retry-writes} ${ruby}"
@@ -1409,7 +1405,7 @@ buildvariants:
14091405 matrix_spec :
14101406 lint : on
14111407 ruby : " ruby-3.2"
1412- mongodb-version : " 6 .0"
1408+ mongodb-version : " 7 .0"
14131409 topology : ' *'
14141410 os : rhel8
14151411 display_name : " ${mongodb-version} ${topology} ${lint} ${ruby}"
@@ -1420,7 +1416,7 @@ buildvariants:
14201416 matrix_spec :
14211417 fork : on
14221418 ruby : " ruby-3.2"
1423- mongodb-version : " 6 .0"
1419+ mongodb-version : " 7 .0"
14241420 topology : ["standalone", "replica-set", "sharded-cluster"]
14251421 os : rhel8
14261422 display_name : " ${mongodb-version} ${topology} fork ${ruby}"
@@ -1431,7 +1427,7 @@ buildvariants:
14311427 matrix_spec :
14321428 solo : on
14331429 ruby : ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1434- mongodb-version : " 6 .0"
1430+ mongodb-version : " 7 .0"
14351431 topology : ["standalone", "replica-set", "sharded-cluster"]
14361432 os : rhel8
14371433 display_name : " ${mongodb-version} ${topology} solo ${ruby}"
@@ -1480,7 +1476,7 @@ buildvariants:
14801476 matrix_spec :
14811477 auth-and-ssl : [ "auth-and-ssl", "noauth-and-nossl" ]
14821478 ruby : jruby-9.3
1483- mongodb-version : " 6 .0"
1479+ mongodb-version : " 7 .0"
14841480 topology : ["standalone", "replica-set", "sharded-cluster"]
14851481 os : rhel8
14861482 display_name : " ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1491,7 +1487,7 @@ buildvariants:
14911487 matrix_spec :
14921488 auth-and-ssl : [ "auth-and-ssl", "noauth-and-nossl" ]
14931489 ruby : ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1494- mongodb-version : " 6 .0"
1490+ mongodb-version : " 7 .0"
14951491 topology : " replica-set"
14961492 compressor : ' zlib'
14971493 os : rhel8
@@ -1503,7 +1499,7 @@ buildvariants:
15031499 matrix_spec :
15041500 auth-and-ssl : [ "auth-and-ssl", "noauth-and-nossl" ]
15051501 ruby : ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1506- mongodb-version : " 6 .0"
1502+ mongodb-version : " 7 .0"
15071503 topology : " replica-set"
15081504 compressor : ' snappy'
15091505 os : rhel8
@@ -1519,7 +1515,7 @@ buildvariants:
15191515 matrix_spec :
15201516 auth-and-ssl : [ "auth-and-ssl", "noauth-and-nossl" ]
15211517 ruby : ["ruby-3.2", "ruby-2.7"]
1522- mongodb-version : " 6 .0"
1518+ mongodb-version : " 7 .0"
15231519 topology : " replica-set"
15241520 compressor : ' zstd'
15251521 os : rhel8
@@ -1530,7 +1526,7 @@ buildvariants:
15301526 - matrix_name : " activesupport"
15311527 matrix_spec :
15321528 ruby : ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1533- mongodb-version : " 6 .0"
1529+ mongodb-version : " 7 .0"
15341530 topology : replica-set
15351531 as : as
15361532 os : rhel8
@@ -1541,7 +1537,7 @@ buildvariants:
15411537 - matrix_name : " bson"
15421538 matrix_spec :
15431539 ruby : ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
1544- mongodb-version : " 6 .0"
1540+ mongodb-version : " 7 .0"
15451541 topology : replica-set
15461542 bson : " *"
15471543 os : rhel8
@@ -1561,7 +1557,7 @@ buildvariants:
15611557 - matrix_name : " kerberos-unit"
15621558 matrix_spec :
15631559 ruby : " ruby-3.2"
1564- mongodb-version : " 6 .0"
1560+ mongodb-version : " 7 .0"
15651561 topology : standalone
15661562 os : rhel8
15671563 auth-and-ssl : kerberos
@@ -1615,7 +1611,7 @@ buildvariants:
16151611 # No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
16161612 ruby : ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
16171613 topology : standalone
1618- mongodb-version : " 6 .0"
1614+ mongodb-version : " 7 .0"
16191615 os : rhel8
16201616 display_name : " OCSP verifier: ${mongodb-version} ${ruby}"
16211617 tasks :
@@ -1628,7 +1624,7 @@ buildvariants:
16281624 ocsp-delegate : on
16291625 ruby : ["ruby-3.2", "ruby-2.7"]
16301626 topology : standalone
1631- mongodb-version : " 6 .0"
1627+ mongodb-version : " 7 .0"
16321628 os : rhel8
16331629 auth-and-ssl : noauth-and-ssl
16341630 display_name : " OCSP integration - must staple: ${mongodb-version} ${ruby}"
@@ -1641,7 +1637,7 @@ buildvariants:
16411637 ocsp-status : unknown
16421638 ruby : ["ruby-3.2", "ruby-2.7"]
16431639 topology : standalone
1644- mongodb-version : " 6 .0"
1640+ mongodb-version : " 7 .0"
16451641 os : rhel8
16461642 auth-and-ssl : noauth-and-ssl
16471643 display_name : " OCSP integration - unknown: ${mongodb-version} ${ruby}"
@@ -1657,7 +1653,7 @@ buildvariants:
16571653 extra-uri-options : " none"
16581654 ruby : ["ruby-3.2", "ruby-2.7"]
16591655 topology : standalone
1660- mongodb-version : " 6 .0"
1656+ mongodb-version : " 7 .0"
16611657 os : rhel8
16621658 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
16631659 tasks :
@@ -1671,7 +1667,7 @@ buildvariants:
16711667 extra-uri-options : " none"
16721668 ruby : ["ruby-3.2", "ruby-2.7"]
16731669 topology : standalone
1674- mongodb-version : " 6 .0"
1670+ mongodb-version : " 7 .0"
16751671 os : rhel8
16761672 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
16771673 tasks :
@@ -1685,7 +1681,7 @@ buildvariants:
16851681 extra-uri-options : " none"
16861682 ruby : ["ruby-3.2", "ruby-2.7"]
16871683 topology : standalone
1688- mongodb-version : " 6 .0"
1684+ mongodb-version : " 7 .0"
16891685 os : rhel8
16901686 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
16911687 tasks :
@@ -1699,7 +1695,7 @@ buildvariants:
16991695 extra-uri-options : " tlsInsecure=true"
17001696 ruby : ["ruby-3.2", "ruby-2.7"]
17011697 topology : standalone
1702- mongodb-version : " 6 .0"
1698+ mongodb-version : " 7 .0"
17031699 os : rhel8
17041700 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17051701 tasks :
@@ -1713,7 +1709,7 @@ buildvariants:
17131709 extra-uri-options : " tlsInsecure=true"
17141710 ruby : ["ruby-3.2", "ruby-2.7"]
17151711 topology : standalone
1716- mongodb-version : " 6 .0"
1712+ mongodb-version : " 7 .0"
17171713 os : rhel8
17181714 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17191715 tasks :
@@ -1727,7 +1723,7 @@ buildvariants:
17271723 extra-uri-options : " tlsInsecure=true"
17281724 ruby : ["ruby-3.2", "ruby-2.7"]
17291725 topology : standalone
1730- mongodb-version : " 6 .0"
1726+ mongodb-version : " 7 .0"
17311727 os : rhel8
17321728 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17331729 tasks :
@@ -1741,7 +1737,7 @@ buildvariants:
17411737 extra-uri-options : " tlsAllowInvalidCertificates=true"
17421738 ruby : ["ruby-3.2", "ruby-2.7"]
17431739 topology : standalone
1744- mongodb-version : " 6 .0"
1740+ mongodb-version : " 7 .0"
17451741 os : rhel8
17461742 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17471743 tasks :
@@ -1755,7 +1751,7 @@ buildvariants:
17551751 extra-uri-options : " tlsAllowInvalidCertificates=true"
17561752 ruby : ["ruby-3.2", "ruby-2.7"]
17571753 topology : standalone
1758- mongodb-version : " 6 .0"
1754+ mongodb-version : " 7 .0"
17591755 os : rhel8
17601756 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17611757 tasks :
@@ -1769,7 +1765,7 @@ buildvariants:
17691765 extra-uri-options : " tlsAllowInvalidCertificates=true"
17701766 ruby : ["ruby-3.2", "ruby-2.7"]
17711767 topology : standalone
1772- mongodb-version : " 6 .0"
1768+ mongodb-version : " 7 .0"
17731769 os : rhel8
17741770 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
17751771 tasks :
@@ -1789,7 +1785,7 @@ buildvariants:
17891785 ocsp-connectivity : pass
17901786 ruby : jruby-9.3
17911787 topology : standalone
1792- mongodb-version : " 6 .0"
1788+ mongodb-version : " 7 .0"
17931789 os : rhel8
17941790 display_name : " OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
17951791 tasks :
@@ -1801,7 +1797,7 @@ buildvariants:
18011797 fle : helper
18021798 topology : standalone
18031799 os : rhel8
1804- mongodb-version : " 6 .0"
1800+ mongodb-version : " 7 .0"
18051801 display_name : " GCP KMS"
18061802 tasks :
18071803 - name : testgcpkms_task_group
@@ -1835,27 +1831,28 @@ buildvariants:
18351831 tasks :
18361832 - name : test-atlas
18371833
1838- - matrix_name : " serverless"
1839- matrix_spec :
1840- # https://jira.mongodb.org/browse/RUBY-3217
1841- # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1842- ruby : ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1843- fle : path
1844- os : rhel8
1845- display_name : " Atlas serverless ${ruby}"
1846- tasks :
1847- - name : serverless_task_group
1848-
1849- - matrix_name : " serverless-next"
1850- matrix_spec :
1851- # https://jira.mongodb.org/browse/RUBY-3217
1852- # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1853- ruby : ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1854- fle : path
1855- os : rhel8
1856- display_name : " Atlas serverless-next ${ruby}"
1857- tasks :
1858- - name : serverless_next_task_group
1834+ # Commented out, pending RUBY-3414
1835+ # - matrix_name: "serverless"
1836+ # matrix_spec:
1837+ # # https://jira.mongodb.org/browse/RUBY-3217
1838+ # # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1839+ # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1840+ # fle: path
1841+ # os: rhel8
1842+ # display_name: "Atlas serverless ${ruby}"
1843+ # tasks:
1844+ # - name: serverless_task_group
1845+ #
1846+ # - matrix_name: "serverless-next"
1847+ # matrix_spec:
1848+ # # https://jira.mongodb.org/browse/RUBY-3217
1849+ # # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
1850+ # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
1851+ # fle: path
1852+ # os: rhel8
1853+ # display_name: "Atlas serverless-next ${ruby}"
1854+ # tasks:
1855+ # - name: serverless_next_task_group
18591856
18601857 - matrix_name : " aws-lambda"
18611858 matrix_spec :
0 commit comments