Skip to content

Fix CI regressions: OCSP TLS URI options and lint variant #3066

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.

Sign up for GitHub

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
comandeo-mongo merged 6 commits into from
Jun 26, 2026
Merged

Fix CI regressions: OCSP TLS URI options and lint variant #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cabfc7b
RUBY-3797 Migrate away from set-temp-creds.sh
comandeo-mongo Jun 23, 2026
ed39d9c
Bumpd det
comandeo-mongo Jun 23, 2026
9c51241
RUBY-3797 Remove MongoDB 4.2 Evergreen variants
comandeo-mongo Jun 24, 2026
08e78a6
Run latest-server variant on master, not on PRs
comandeo-mongo Jun 24, 2026
460c6d5
RUBY-3472 Fix TLS URI options for non-connectivity OCSP variants
comandeo-mongo Jun 24, 2026
56ce80b
RUBY-3824 Fix session_spec lint failure in pin_to_server test
comandeo-mongo Jun 24, 2026
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
15 changes: 5 additions & 10 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,11 +711,6 @@ axes:
variables:
MONGODB_VERSION: "4.4"
CRYPT_SHARED_VERSION: "6.0.5"
- id: "4.2"
display_name: "4.2"
variables:
MONGODB_VERSION: "4.2"
CRYPT_SHARED_VERSION: "6.0.5"

- id: "topology"
display_name: Topology
Expand Down Expand Up @@ -1131,7 +1126,7 @@ buildvariants:
- matrix_name: "mongo-4.x"
matrix_spec:
ruby: ["ruby-3.0", "ruby-2.7"]
mongodb-version: ['4.4', '4.2']
mongodb-version: ['4.4']
topology: ["standalone", "replica-set", "sharded-cluster"]
Comment on lines 1126 to 1130
os: ubuntu1804
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
Expand Down Expand Up @@ -1258,7 +1253,7 @@ buildvariants:
matrix_spec:
stress: on
ruby: "ruby-2.7"
mongodb-version: ['4.4', '4.2']
mongodb-version: ['4.4']
topology: replica-set
os: ubuntu1804
display_name: "${mongodb-version} ${topology} stress ${ruby}"
Expand Down Expand Up @@ -1458,10 +1453,10 @@ buildvariants:
# tasks:
# - name: "test-fle"

# Runs specs against the latest server. This is not automatically run on PR's
# because we don't want to block PR's when the latest DB breaks something.
# Runs specs against the latest server. Not run on PRs to avoid blocking
# merges when an unreleased MongoDB build breaks something.
- name: 'latest-server'
activate: false
patchable: false
display_name: 'Latest MongoDB Server'
run_on: ubuntu2204-small
expansions:
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/config/axes.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ axes:
variables:
MONGODB_VERSION: "4.4"
CRYPT_SHARED_VERSION: "6.0.5"
- id: "4.2"
display_name: "4.2"
variables:
MONGODB_VERSION: "4.2"
CRYPT_SHARED_VERSION: "6.0.5"

- id: "topology"
display_name: Topology
Expand Down
10 changes: 5 additions & 5 deletions .evergreen/config/standard.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ buildvariants:
- matrix_name: "mongo-4.x"
matrix_spec:
ruby: <%= older_rubies %>
mongodb-version: ['4.4', '4.2']
mongodb-version: ['4.4']
topology: <%= topologies %>
os: ubuntu1804
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
Expand Down Expand Up @@ -232,7 +232,7 @@ buildvariants:
matrix_spec:
stress: on
ruby: <%= supported_mri_ruby_2 %>
mongodb-version: ['4.4', '4.2']
mongodb-version: ['4.4']
topology: replica-set
os: ubuntu1804
display_name: "${mongodb-version} ${topology} stress ${ruby}"
Expand Down Expand Up @@ -372,10 +372,10 @@ buildvariants:
# tasks:
# - name: "test-fle"

# Runs specs against the latest server. This is not automatically run on PR's
# because we don't want to block PR's when the latest DB breaks something.
# Runs specs against the latest server. Not run on PRs to avoid blocking
# merges when an unreleased MongoDB build breaks something.
- name: 'latest-server'
activate: false
patchable: false
display_name: 'Latest MongoDB Server'
run_on: ubuntu2204-small
expansions:
Expand Down
121 changes: 0 additions & 121 deletions .evergreen/run-tests-serverless.sh
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@ fi
if test -n "$OCSP_CONNECTIVITY"; then
add_uri_option tls=true
add_uri_option "tlsCAFile=$DRIVERS_TOOLS/.evergreen/ocsp/$OCSP_ALGORITHM/ca.pem"
elif test -n "${OCSP_ALGORITHM:-}"; then
add_uri_option tls=true
add_uri_option "tlsCAFile=$_ocsp_ca"
add_uri_option "tlsCertificateKeyFile=spec/support/ocsp/$OCSP_ALGORITHM/server.pem"
fi

if test -n "$EXTRA_URI_OPTIONS"; then
Expand Down
2 changes: 1 addition & 1 deletion .mod/drivers-evergreen-tools
Open in desktop
Submodule drivers-evergreen-tools updated 8 files
+2 −0 .evergreen/csfle/await-servers.sh
+4 −2 .evergreen/csfle/kms_failpoint_server.py
+200 −0 .evergreen/csfle/kms_http_proxy.py
+4 −0 .evergreen/csfle/setup-secrets.sh
+2 −0 .evergreen/csfle/setup_secrets.py
+31 −22 .evergreen/csfle/start-servers.sh
+12 −0 .evergreen/orchestration/drivers_orchestration.py
+1 −2 .evergreen/orchestration/mongodb_runner.py
4 changes: 3 additions & 1 deletion spec/mongo/session_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@
it 'does not raise on the second call' do
server = authorized_client.cluster.next_primary
server.with_connection do |connection|
session.pin_to_server(server)
# Set @pinned_server directly to avoid the lint check in pin_to_server,
# which requires a mongos. We are testing unpin, not pin_to_server.
session.instance_variable_set(:@pinned_server, server)
session.unpin(connection)

expect do
Expand Down
6 changes: 3 additions & 3 deletions spec/support/spec_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,17 @@ def fle_aws_arn
ENV['MONGO_RUBY_DRIVER_AWS_ARN']
end

# AWS temporary access key id (set by set-temp-creds.sh)
# AWS temporary access key id (set by setup-secrets.sh)
def fle_aws_temp_key
ENV['CSFLE_AWS_TEMP_ACCESS_KEY_ID']
end

# AWS temporary secret access key (set by set-temp-creds.sh)
# AWS temporary secret access key (set by setup-secrets.sh)
def fle_aws_temp_secret
ENV['CSFLE_AWS_TEMP_SECRET_ACCESS_KEY']
end

# AWS temporary session token (set by set-temp-creds.sh)
# AWS temporary session token (set by setup-secrets.sh)
def fle_aws_temp_session_token
ENV['CSFLE_AWS_TEMP_SESSION_TOKEN']
end
Expand Down
Loading