Skip to content

Fix failing specs #2929

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
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
90 changes: 46 additions & 44 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ buildvariants:
- matrix_name: DriverBench
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: standalone
os: ubuntu2204
display_name: DriverBench
Expand Down Expand Up @@ -1388,7 +1388,7 @@ buildvariants:
- matrix_name: "single-lb"
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: load-balanced
single-mongos: single-mongos
os: ubuntu2204
Expand All @@ -1410,7 +1410,7 @@ buildvariants:
- matrix_name: "single-mongos"
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: "sharded-cluster"
single-mongos: single-mongos
os: ubuntu2204
Expand All @@ -1421,7 +1421,7 @@ buildvariants:
- matrix_name: CSOT
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: replica-set-single-node
os: ubuntu2204
display_name: "CSOT - ${mongodb-version}"
Expand All @@ -1432,7 +1432,7 @@ buildvariants:
matrix_spec:
retry-reads: no-retry-reads
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
Expand All @@ -1443,7 +1443,7 @@ buildvariants:
matrix_spec:
retry-writes: no-retry-writes
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: [replica-set, sharded-cluster]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
Expand All @@ -1465,7 +1465,7 @@ buildvariants:
matrix_spec:
lint: on
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
Expand All @@ -1476,7 +1476,7 @@ buildvariants:
matrix_spec:
fork: on
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} fork ${ruby}"
Expand All @@ -1487,7 +1487,7 @@ buildvariants:
matrix_spec:
solo: on
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} solo ${ruby}"
Expand Down Expand Up @@ -1520,7 +1520,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: "x509"
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: standalone
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
Expand All @@ -1531,7 +1531,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: jruby-9.4
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: ["standalone", "replica-set", "sharded-cluster"]
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
Expand All @@ -1542,7 +1542,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: "replica-set"
compressor: 'zlib'
os: ubuntu2204
Expand All @@ -1554,7 +1554,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: "replica-set"
compressor: 'snappy'
os: ubuntu2204
Expand All @@ -1570,7 +1570,7 @@ buildvariants:
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: "replica-set"
compressor: 'zstd'
os: ubuntu2204
Expand All @@ -1581,7 +1581,7 @@ buildvariants:
- matrix_name: activesupport-"ruby-3.3"
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: replica-set
as: as
os: ubuntu2204
Expand All @@ -1592,7 +1592,7 @@ buildvariants:
- matrix_name: bson-"ruby-3.3"
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: replica-set
bson: "*"
os: ubuntu2204
Expand Down Expand Up @@ -1684,34 +1684,36 @@ buildvariants:
- matrix_name: "kerberos-unit"
matrix_spec:
ruby: "ruby-3.3"
mongodb-version: "7.0"
mongodb-version: "8.0"
topology: standalone
os: ubuntu2204
auth-and-ssl: kerberos
display_name: "Kerberos Tests"
tasks:
- name: "test-kerberos"

- matrix_name: "fle-latest"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: "ruby-3.3"
topology: [replica-set, sharded-cluster]
mongodb-version: [ 'latest' ]
os: ubuntu2204
fle: helper
display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
tasks:
- name: "test-fle"
# - matrix_name: "fle-latest"
# matrix_spec:
# auth-and-ssl: "noauth-and-nossl"
# ruby:
# topology: [replica-set, sharded-cluster]
# mongodb-version: [ 'latest' ]
# os: ubuntu2204
# fle: helper
# display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
# tasks:
# - name: "test-fle"

- matrix_name: aws-auth-regular
matrix_spec:
# 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 ]
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
# https://jira.mongodb.org/browse/RUBY-3659
auth-and-ssl: [ aws-regular, aws-assume-role, aws-web-identity ]
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1723,7 +1725,7 @@ buildvariants:
# No JRuby due to https://github.com/jruby/jruby-openssl/issues/210
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1736,7 +1738,7 @@ buildvariants:
ocsp-delegate: on
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
Expand All @@ -1749,7 +1751,7 @@ buildvariants:
ocsp-status: unknown
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
Expand All @@ -1765,7 +1767,7 @@ buildvariants:
extra-uri-options: "none"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1779,7 +1781,7 @@ buildvariants:
extra-uri-options: "none"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1793,7 +1795,7 @@ buildvariants:
extra-uri-options: "none"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1807,7 +1809,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1821,7 +1823,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1835,7 +1837,7 @@ buildvariants:
extra-uri-options: "tlsInsecure=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1849,7 +1851,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1863,7 +1865,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1877,7 +1879,7 @@ buildvariants:
extra-uri-options: "tlsAllowInvalidCertificates=true"
ruby: "ruby-3.3"
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1897,7 +1899,7 @@ buildvariants:
ocsp-connectivity: pass
ruby: jruby-9.4
topology: standalone
mongodb-version: "7.0"
mongodb-version: "8.0"
os: ubuntu2204
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
tasks:
Expand All @@ -1910,7 +1912,7 @@ buildvariants:
# fle: helper
# topology: standalone
# os: ubuntu2204
# mongodb-version: "7.0"
# mongodb-version: "8.0"
# display_name: "GCP KMS"
# tasks:
# - name: testgcpkms_task_group
Expand Down
28 changes: 15 additions & 13 deletions .evergreen/config/standard.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
jrubies

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

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

- matrix_name: "fle-latest"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: <%= latest_ruby %>
topology: [replica-set, sharded-cluster]
mongodb-version: [ 'latest' ]
os: ubuntu2204
fle: helper
display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
tasks:
- name: "test-fle"
# - matrix_name: "fle-latest"
# matrix_spec:
# auth-and-ssl: "noauth-and-nossl"
# ruby: <%#= latest_ruby %>
# topology: [replica-set, sharded-cluster]
# mongodb-version: [ 'latest' ]
# os: ubuntu2204
# fle: helper
# display_name: "FLE: ${mongodb-version} ${topology} ${ruby}"
# tasks:
# - name: "test-fle"

- matrix_name: aws-auth-regular
matrix_spec:
# 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 ]
# auth-and-ssl: [ aws-regular, aws-assume-role, aws-ecs, aws-web-identity ]
# https://jira.mongodb.org/browse/RUBY-3659
auth-and-ssl: [ aws-regular, aws-assume-role, aws-web-identity ]
ruby: <%= latest_ruby %>
topology: standalone
mongodb-version: <%= latest_stable_mdb %>
Expand Down
2 changes: 1 addition & 1 deletion spec/shared
Submodule shared updated 2 files
+10 −0 shlib/distro.sh
+2 −2 shlib/server.sh
Loading