Skip to content
Closed
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
94 changes: 47 additions & 47 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,10 @@ axes:
- id: "ruby"
display_name: Ruby Version
values:
- id: "ruby-3.3"
display_name: ruby-3.3
variables:
RVM_RUBY: "ruby-3.3"
- id: "ruby-3.2"
display_name: ruby-3.2
variables:
Expand All @@ -1048,10 +1052,6 @@ axes:
display_name: ruby-3.1
variables:
RVM_RUBY: "ruby-3.1"
- id: "ruby-3.1"
display_name: ruby-3.1
variables:
RVM_RUBY: "ruby-3.1"
- id: "ruby-3.0"
display_name: ruby-3.0
variables:
Expand Down Expand Up @@ -1306,7 +1306,7 @@ axes:
buildvariants:
- matrix_name: DriverBench
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: standalone
os: ubuntu2204
Expand All @@ -1317,7 +1317,7 @@ buildvariants:
- matrix_name: "auth/ssl"
matrix_spec:
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: ["latest", "8.0", "7.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
Expand All @@ -1327,7 +1327,7 @@ buildvariants:

- matrix_name: "mongo-recent"
matrix_spec:
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "jruby-9.4"]
mongodb-version: ["latest", "8.0", "7.0"]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
Expand All @@ -1337,7 +1337,7 @@ buildvariants:

- matrix_name: "mongo-8-arm"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: [ '8.0' ]
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2404-arm
Expand All @@ -1347,7 +1347,7 @@ buildvariants:

- matrix_name: "mongo-5.x"
matrix_spec:
ruby: ["ruby-3.2", "ruby-3.1", "jruby-9.4"]
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1", "jruby-9.4"]
mongodb-version: ['5.3']
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu1804
Expand Down Expand Up @@ -1377,7 +1377,7 @@ buildvariants:

- matrix_name: "single-lb"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: load-balanced
single-mongos: single-mongos
Expand All @@ -1388,7 +1388,7 @@ buildvariants:

- matrix_name: "mongo-api-version"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: '7.0'
topology: standalone
api-version-required: yes
Expand All @@ -1399,7 +1399,7 @@ buildvariants:

- matrix_name: "single-mongos"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: "sharded-cluster"
single-mongos: single-mongos
Expand All @@ -1410,7 +1410,7 @@ buildvariants:

- matrix_name: CSOT
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: replica-set-single-node
os: ubuntu2204
Expand All @@ -1421,7 +1421,7 @@ buildvariants:
- matrix_name: "no-retry-reads"
matrix_spec:
retry-reads: no-retry-reads
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
Expand All @@ -1432,7 +1432,7 @@ buildvariants:
- matrix_name: "no-retry-writes"
matrix_spec:
retry-writes: no-retry-writes
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: [replica-set, sharded-cluster]
os: ubuntu2204
Expand All @@ -1454,7 +1454,7 @@ buildvariants:
- matrix_name: "lint"
matrix_spec:
lint: on
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
Expand All @@ -1465,7 +1465,7 @@ buildvariants:
- matrix_name: "fork"
matrix_spec:
fork: on
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
Expand Down Expand Up @@ -1498,7 +1498,7 @@ buildvariants:
- matrix_name: "stress"
matrix_spec:
stress: on
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: ["8.0", "7.0"]
topology: replica-set
os: ubuntu2204
Expand Down Expand Up @@ -1533,10 +1533,10 @@ buildvariants:
tasks:
- name: "test-mlaunch"

- matrix_name: zlib-"ruby-3.2"
- matrix_name: zlib-"ruby-3.3"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'zlib'
Expand All @@ -1545,10 +1545,10 @@ buildvariants:
tasks:
- name: "test-mlaunch"

- matrix_name: snappy-"ruby-3.2"
- matrix_name: snappy-"ruby-3.3"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'snappy'
Expand All @@ -1561,10 +1561,10 @@ buildvariants:
# apparently a zstd-jni gem for JRuby that we could investigate here; if
# this test is ever supported to support jruby, the `sample_mri_rubies`
# reference should be replaced with `sample_rubies`.
- matrix_name: zstd-auth-"ruby-3.2"
- matrix_name: zstd-auth-"ruby-3.3"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: "replica-set"
compressor: 'zstd'
Expand All @@ -1573,9 +1573,9 @@ buildvariants:
tasks:
- name: "test-mlaunch"

- matrix_name: activesupport-"ruby-3.2"
- matrix_name: activesupport-"ruby-3.3"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: replica-set
as: as
Expand All @@ -1584,9 +1584,9 @@ buildvariants:
tasks:
- name: "test-mlaunch"

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

- matrix_name: "kerberos-unit"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
mongodb-version: "7.0"
topology: standalone
os: ubuntu2204
Expand All @@ -1690,7 +1690,7 @@ buildvariants:
- matrix_name: "fle-latest"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: [replica-set, sharded-cluster]
mongodb-version: [ 'latest' ]
os: ubuntu2204
Expand All @@ -1704,7 +1704,7 @@ buildvariants:
# https://jira.mongodb.org/browse/RUBY-3311
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ec2, aws-ecs, aws-web-identity ]
auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
ruby: "ruby-3.2"
ruby: "ruby-3.3"
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 Down Expand Up @@ -1734,7 +1734,7 @@ buildvariants:
ocsp-algorithm: ecdsa
ocsp-must-staple: on
ocsp-delegate: on
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1747,7 +1747,7 @@ buildvariants:
matrix_spec:
ocsp-algorithm: rsa
ocsp-status: unknown
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1763,7 +1763,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "none"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1777,7 +1777,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "none"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1791,7 +1791,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: fail
extra-uri-options: "none"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1805,7 +1805,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1819,7 +1819,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1833,7 +1833,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1847,7 +1847,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1861,7 +1861,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand All @@ -1875,7 +1875,7 @@ buildvariants:
ocsp-delegate: '*'
ocsp-connectivity: pass
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.2"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
os: ubuntu2204
Expand Down Expand Up @@ -1906,7 +1906,7 @@ buildvariants:
# https://jira.mongodb.org/browse/RUBY-3540
#- matrix_name: testgcpkms-variant
# matrix_spec:
# ruby: "ruby-3.2"
# ruby: "ruby-3.3"
# fle: helper
# topology: standalone
# os: ubuntu2204
Expand All @@ -1930,7 +1930,7 @@ buildvariants:

- matrix_name: atlas-full
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
os: ubuntu2204
display_name: "Atlas (Full)"
tasks:
Expand All @@ -1946,7 +1946,7 @@ buildvariants:

- matrix_name: "serverless"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
fle: path
os: ubuntu2204
display_name: "Atlas serverless ${ruby}"
Expand All @@ -1955,7 +1955,7 @@ buildvariants:

- matrix_name: "aws-lambda"
matrix_spec:
ruby: "ruby-3.2"
ruby: "ruby-3.3"
os: ubuntu2204
display_name: "AWS Lambda"
tasks:
Expand Down
Loading