Skip to content

RUBY-3200 add Ruby 3.2 to CI #2728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ buildvariants:
- matrix_name: "auth/ssl"
matrix_spec:
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: ["latest", "7.0", "6.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
Expand All @@ -1072,7 +1072,7 @@ buildvariants:

- matrix_name: "mongo-recent"
matrix_spec:
ruby: ["ruby-3.1", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.3"]
mongodb-version: ["latest", "7.0", "6.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ['rhel8']
Expand All @@ -1090,7 +1090,7 @@ buildvariants:
# RUBY-3226)
- matrix_name: "mongo-recent-arm"
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
#mongodb-version: ['latest', '6.0']
mongodb-version: ['6.0']
topology: ["standalone", "replica-set", "sharded-cluster"]
Expand All @@ -1101,7 +1101,7 @@ buildvariants:

- matrix_name: "mongo-5.x"
matrix_spec:
ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: ['5.3', '5.0']
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
Expand Down Expand Up @@ -1131,7 +1131,7 @@ buildvariants:

- matrix_name: "single-lb"
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: load-balanced
single-mongos: single-mongos
Expand All @@ -1142,7 +1142,7 @@ buildvariants:

- matrix_name: "mongo-5.0-api-version"
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: '5.0'
topology: standalone
api-version-required: yes
Expand All @@ -1153,7 +1153,7 @@ buildvariants:

- matrix_name: "single-mongos"
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: "sharded-cluster"
single-mongos: single-mongos
Expand All @@ -1165,7 +1165,7 @@ buildvariants:
- matrix_name: "no-retry-reads"
matrix_spec:
retry-reads: no-retry-reads
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
Expand All @@ -1176,7 +1176,7 @@ buildvariants:
- matrix_name: "no-retry-writes"
matrix_spec:
retry-writes: no-retry-writes
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: [replica-set, sharded-cluster]
os: rhel8
Expand All @@ -1198,7 +1198,7 @@ buildvariants:
- matrix_name: "lint"
matrix_spec:
lint: on
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: '*'
os: rhel8
Expand All @@ -1209,7 +1209,7 @@ buildvariants:
- matrix_name: "fork"
matrix_spec:
fork: on
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
Expand All @@ -1220,7 +1220,7 @@ buildvariants:
- matrix_name: "solo"
matrix_spec:
solo: on
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
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"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: rhel8
Expand All @@ -1242,7 +1242,7 @@ buildvariants:
- matrix_name: "stress"
matrix_spec:
stress: on
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: ["6.0", "5.3"]
topology: replica-set
os: rhel8
Expand All @@ -1256,7 +1256,7 @@ buildvariants:
# - matrix_name: "x509-tests"
# matrix_spec:
# auth-and-ssl: "x509"
# ruby: "ruby-3.1"
# ruby: "ruby-3.2"
# # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
# # the server for certain auth mechanisms. Once run-tests.sh is made smart
# # enough to install mongosh, and then use either mongo or mongosh
Expand All @@ -1283,7 +1283,7 @@ buildvariants:
- matrix_name: "zlib"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
topology: "replica-set"
compressor: 'zlib'
Expand All @@ -1295,7 +1295,7 @@ buildvariants:
- matrix_name: "snappy"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
topology: "replica-set"
compressor: 'snappy'
Expand All @@ -1311,7 +1311,7 @@ buildvariants:
- matrix_name: "zstd-auth"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
mongodb-version: "6.0"
topology: "replica-set"
compressor: 'zstd'
Expand All @@ -1322,7 +1322,7 @@ buildvariants:

- matrix_name: "activesupport"
matrix_spec:
ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
topology: replica-set
as: as
Expand All @@ -1333,7 +1333,7 @@ buildvariants:

- matrix_name: "bson"
matrix_spec:
ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
mongodb-version: "6.0"
topology: replica-set
bson: "*"
Expand All @@ -1345,15 +1345,15 @@ buildvariants:
# kerberos integration tests are broken (RUBY-3266)
# - matrix_name: "kerberos-integration"
# matrix_spec:
# ruby: ["ruby-3.1", "ruby-2.7", "jruby-9.3"]
# ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.3"]
# os: rhel8
# display_name: "Kerberos integration ${os} ${ruby}"
# tasks:
# - name: "test-kerberos-integration"

- matrix_name: "kerberos-unit"
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
mongodb-version: "6.0"
topology: standalone
os: rhel8
Expand All @@ -1365,7 +1365,7 @@ buildvariants:
- matrix_name: "fle-latest"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: "ruby-3.1"
ruby: "ruby-3.2"
topology: [replica-set, sharded-cluster]
mongodb-version: [ 'latest', '7.0' ]
os: rhel8
Expand All @@ -1377,7 +1377,7 @@ buildvariants:
- matrix_name: "fle"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: [replica-set, sharded-cluster]
mongodb-version: [ '6.0', '4.4', '4.2', '4.0' ]
os: rhel8
Expand All @@ -1389,7 +1389,7 @@ buildvariants:
- matrix_name: aws-auth-regular
matrix_spec:
auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
ruby: "ruby-3.1"
ruby: "ruby-3.2"
topology: standalone
# needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
# the server for certain auth mechanisms. Once run-tests.sh is made smart
Expand All @@ -1406,7 +1406,7 @@ buildvariants:
matrix_spec:
ocsp-verifier: true
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
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"
os: rhel8
Expand All @@ -1419,7 +1419,7 @@ buildvariants:
ocsp-algorithm: ecdsa
ocsp-must-staple: on
ocsp-delegate: on
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1432,7 +1432,7 @@ buildvariants:
matrix_spec:
ocsp-algorithm: rsa
ocsp-status: unknown
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1448,7 +1448,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "none"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1462,7 +1462,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "none"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1476,7 +1476,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: fail
extra-uri-options: "none"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1490,7 +1490,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1504,7 +1504,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1518,7 +1518,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1532,7 +1532,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1546,7 +1546,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand All @@ -1560,7 +1560,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: ["ruby-3.1", "ruby-2.7"]
ruby: ["ruby-3.2", "ruby-2.7"]
topology: standalone
mongodb-version: "6.0"
os: rhel8
Expand Down Expand Up @@ -1590,7 +1590,7 @@ buildvariants:

- matrix_name: testgcpkms-variant
matrix_spec:
ruby: "ruby-3.1"
ruby: "ruby-3.2"
fle: helper
topology: standalone
os: rhel8
Expand All @@ -1614,7 +1614,7 @@ buildvariants:

- matrix_name: "atlas"
matrix_spec:
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
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"]
os: rhel8
display_name: "Atlas tests ${ruby}"
tasks:
Expand All @@ -1623,8 +1623,8 @@ buildvariants:
- matrix_name: "serverless"
matrix_spec:
# https://jira.mongodb.org/browse/RUBY-3217
# ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5", "jruby-9.3", "jruby-9.2"]
ruby: ["ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
# 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"]
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
fle: path
os: rhel8
display_name: "Atlas serverless ${ruby} single mongos"
Expand Down
14 changes: 4 additions & 10 deletions .evergreen/config/standard.yml.erb
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<%
topologies = %w( standalone replica-set sharded-cluster )

# ruby-3.2 is available in the toolchain, but tests break. It will
# require some investigation. Once available:
# 1. set `latest_ruby` to ruby-3.2
# 2. add ruby-3.2 to `recent_rubies` and `supported_mri_rubies`
# 3. replace ruby-3.1 with ruby-3.2 in `sample_mri_rubies`.

# jruby-9.4 is available in the toolchain, but tests break. It will
# require some investigation. Once available:
# 1. replace jruby-9.3 with jruby-9.4 in `recent_rubies` and
Expand All @@ -15,13 +9,13 @@

# latest_ruby = the most recently released, stable version of Ruby
# (make sure this version is being built by 10gen/mongo-ruby-toolchain)
latest_ruby = "ruby-3.1".inspect # so it gets quoted as a string
latest_ruby = "ruby-3.2".inspect # so it gets quoted as a string

# these are used for testing against a few recent ruby versions
recent_rubies = %w( ruby-3.1 jruby-9.3 )
recent_rubies = %w( ruby-3.2 ruby-3.1 jruby-9.3 )

# this is a list of the most most recent 3.x and 2.x MRI ruby versions
sample_mri_rubies = %w( ruby-3.1 ruby-2.7 )
sample_mri_rubies = %w( ruby-3.2 ruby-2.7 )

# as above, but including the most recent JRuby release
sample_rubies = sample_mri_rubies + %w( jruby-9.3 )
Expand All @@ -32,7 +26,7 @@
# all supported JRuby versions provided by 10gen/mongo-ruby-toolchain
jrubies = %w( jruby-9.3 jruby-9.2 )

supported_mri_rubies = %w( ruby-3.1 ruby-3.0
supported_mri_rubies = %w( ruby-3.2 ruby-3.1 ruby-3.0
ruby-2.7 ruby-2.6 ruby-2.5 )

supported_rubies = supported_mri_rubies + jrubies
Expand Down
Loading