Skip to content

Commit

Permalink
don't build tasks for latest server version for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamis
jamis committed Feb 28, 2024
1 parent 44c607f commit c6fd91d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 41 deletions.
66 changes: 31 additions & 35 deletions .evergreen/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1273,7 +1273,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
ruby: "ruby-3.2"
mongodb-version: ["latest", "7.0", "6.0"]
mongodb-version: ["7.0", "6.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
Expand All @@ -1283,7 +1283,7 @@ buildvariants:
- matrix_name: "mongo-recent"
matrix_spec:
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.3"]
mongodb-version: ["latest", "7.0", "6.0"]
mongodb-version: ["7.0", "6.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ['rhel8']
# There is no latest for ubuntu2204, so we can't test it here.
Expand All @@ -1295,14 +1295,10 @@ buildvariants:
# Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
# issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
# and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
#
# further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
# RUBY-3226)
- matrix_name: "mongo-recent-arm"
matrix_spec:
ruby: "ruby-3.2"
#mongodb-version: ['latest', '6.0']
mongodb-version: ['6.0']
mongodb-version: ["7.0", "6.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: 'rhel8-arm'
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
Expand Down Expand Up @@ -1342,7 +1338,7 @@ buildvariants:
- matrix_name: "single-lb"
matrix_spec:
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: load-balanced
single-mongos: single-mongos
os: rhel8
Expand All @@ -1364,7 +1360,7 @@ buildvariants:
- matrix_name: "single-mongos"
matrix_spec:
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: "sharded-cluster"
single-mongos: single-mongos
os: rhel8
Expand All @@ -1376,7 +1372,7 @@ buildvariants:
matrix_spec:
retry-reads: no-retry-reads
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
Expand All @@ -1387,7 +1383,7 @@ buildvariants:
matrix_spec:
retry-writes: no-retry-writes
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: [replica-set, sharded-cluster]
os: rhel8
display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
Expand All @@ -1409,7 +1405,7 @@ buildvariants:
matrix_spec:
lint: on
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: '*'
os: rhel8
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
Expand All @@ -1420,7 +1416,7 @@ buildvariants:
matrix_spec:
fork: on
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
display_name: "${mongodb-version} ${topology} fork ${ruby}"
Expand All @@ -1431,7 +1427,7 @@ buildvariants:
matrix_spec:
solo: on
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"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
display_name: "${mongodb-version} ${topology} solo ${ruby}"
Expand Down Expand Up @@ -1480,7 +1476,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: jruby-9.3
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
Expand All @@ -1491,7 +1487,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'zlib'
os: rhel8
Expand All @@ -1503,7 +1499,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'snappy'
os: rhel8
Expand All @@ -1519,7 +1515,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.2", "ruby-2.7"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'zstd'
os: rhel8
Expand All @@ -1530,7 +1526,7 @@ buildvariants:
- matrix_name: "activesupport"
matrix_spec:
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: replica-set
as: as
os: rhel8
Expand All @@ -1541,7 +1537,7 @@ buildvariants:
- matrix_name: "bson"
matrix_spec:
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: replica-set
bson: "*"
os: rhel8
Expand All @@ -1561,7 +1557,7 @@ buildvariants:
- matrix_name: "kerberos-unit"
matrix_spec:
ruby: "ruby-3.2"
mongodb-version: "6.0"
mongodb-version: "7.0"
topology: standalone
os: rhel8
auth-and-ssl: kerberos
Expand Down Expand Up @@ -1615,7 +1611,7 @@ buildvariants:
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1628,7 +1624,7 @@ buildvariants:
ocsp-delegate: on
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
Expand All @@ -1641,7 +1637,7 @@ buildvariants:
ocsp-status: unknown
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
Expand All @@ -1657,7 +1653,7 @@ buildvariants:
extra-uri-options: "none"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1671,7 +1667,7 @@ buildvariants:
extra-uri-options: "none"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1685,7 +1681,7 @@ buildvariants:
extra-uri-options: "none"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1699,7 +1695,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1713,7 +1709,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1727,7 +1723,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1741,7 +1737,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1755,7 +1751,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1769,7 +1765,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1789,7 +1785,7 @@ buildvariants:
ocsp-connectivity: pass
ruby: jruby-9.3
topology: standalone
mongodb-version: "6.0"
mongodb-version: "7.0"
os: rhel8
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1801,7 +1797,7 @@ buildvariants:
fle: helper
topology: standalone
os: rhel8
mongodb-version: "6.0"
mongodb-version: "7.0"
display_name: "GCP KMS"
tasks:
- name: testgcpkms_task_group
Expand Down
13 changes: 7 additions & 6 deletions .evergreen/config/standard.yml.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@
supported_rubies = supported_mri_rubies + jrubies

# The latest stable version of MongoDB
latest_stable_mdb = "6.0".inspect # so it gets quoted as a string
latest_stable_mdb = "7.0".inspect # so it gets quoted as a string

# A few of the most recent MongoDB versions
actual_and_upcoming_mdb = %w( latest 7.0 6.0 )

# FIXME: RUBY-3400, DRIVERS-2816 -- test failures on latest, so
# let's just silence latest for now.
actual_and_upcoming_mdb.delete 'latest'

recent_mdb = %w( 6.0 5.3 )
latest_5x_mdb = "5.3".inspect # so it gets quoted as a string
%>
Expand Down Expand Up @@ -77,14 +82,10 @@ buildvariants:
# Only JRuby-9.4 is built for arm in the current toolchain, but 9.4 has other
# issues. Either we fix those issues, or we build 9.3 for arm in the toolchain,
# and hope it fixes the issues... Until then, we can only test MRI ruby on arm.
#
# further: 'latest' is broken until the QE2 changes are merged (RUBY-3211,
# RUBY-3226)
- matrix_name: "mongo-recent-arm"
matrix_spec:
ruby: <%= latest_ruby %>
#mongodb-version: ['latest', '6.0']
mongodb-version: ['6.0']
mongodb-version: <%= actual_and_upcoming_mdb %>
topology: <%= topologies %>
os: 'rhel8-arm'
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
Expand Down

0 comments on commit c6fd91d

Please sign in to comment.