Skip to content

RUBY-3727 Use orchestration for ssl configs #2974

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

Open
comandeo-mongo wants to merge 2 commits into
base: master
Choose a base branch
from
+94 −163
Open

RUBY-3727 Use orchestration for ssl configs #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
574c62a
RUBY-3727 Use orchestration for ssl configs
comandeo-mongo Nov 28, 2025
16f8d4b
Update spec/support/spec_config.rb
comandeo-mongo Jan 9, 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
18 changes: 9 additions & 9 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ functions:
params:
binary: bash
working_dir: "src"
include_expansions_in_env: [MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
include_expansions_in_env: [DRIVERS_TOOLS, MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
args:
- ".evergreen/run-tests-new.sh"
"run tests":
Expand Down Expand Up @@ -1189,7 +1189,7 @@ buildvariants:
os: ubuntu2204
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: "mongo-recent"
matrix_spec:
Expand Down Expand Up @@ -1381,7 +1381,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: zlib-"ruby-3.3"
matrix_spec:
Expand All @@ -1393,7 +1393,7 @@ buildvariants:
os: ubuntu2204
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: snappy-"ruby-3.3"
matrix_spec:
Expand All @@ -1405,7 +1405,7 @@ buildvariants:
os: ubuntu2204
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

# the zstd-ruby gem does not support JRuby (explicitly). However, there is
# apparently a zstd-jni gem for JRuby that we could investigate here; if
Expand All @@ -1421,7 +1421,7 @@ buildvariants:
os: ubuntu2204
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: activesupport-"ruby-3.3"
matrix_spec:
Expand Down Expand Up @@ -1454,7 +1454,7 @@ buildvariants:
os: ubuntu2004
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: snappy-"ruby-2.7"
matrix_spec:
Expand All @@ -1466,7 +1466,7 @@ buildvariants:
os: ubuntu2004
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

# the zstd-ruby gem does not support JRuby (explicitly). However, there is
# apparently a zstd-jni gem for JRuby that we could investigate here; if
Expand All @@ -1482,7 +1482,7 @@ buildvariants:
os: ubuntu2004
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: activesupport-"ruby-2.7"
matrix_spec:
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config/common.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ functions:
params:
binary: bash
working_dir: "src"
include_expansions_in_env: [MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
include_expansions_in_env: [DRIVERS_TOOLS, MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
args:
- ".evergreen/run-tests-new.sh"
"run tests":
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 @@ -59,7 +59,7 @@ buildvariants:
os: ubuntu2204
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: "mongo-recent"
matrix_spec:
Expand Down Expand Up @@ -251,7 +251,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

<% [
[latest_ruby, latest_stable_mdb, 'ubuntu2204'],
Expand All @@ -268,7 +268,7 @@ buildvariants:
os: <%= distro %>
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: <%= "snappy-#{rubies}" %>
matrix_spec:
Expand All @@ -280,7 +280,7 @@ buildvariants:
os: <%= distro %>
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

# the zstd-ruby gem does not support JRuby (explicitly). However, there is
# apparently a zstd-jni gem for JRuby that we could investigate here; if
Expand All @@ -296,7 +296,7 @@ buildvariants:
os: <%= distro %>
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "run-main-test-suite"

- matrix_name: <%= "activesupport-#{rubies}" %>
matrix_spec:
Expand Down
9 changes: 8 additions & 1 deletion .evergreen/lib/server_setup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require 'mongo'
require_relative '../../spec/support/utils'
require_relative '../../spec/support/spec_setup'

Mongo::Logger.logger.level = :WARN

Expand Down Expand Up @@ -88,7 +90,12 @@ def env_true?(key)
end

def client
@client ||= Mongo::Client.new(ENV.fetch('MONGODB_URI'))
@client ||= Mongo::Client.new(
SpecConfig.instance.addresses,
SpecConfig.instance.all_test_options.merge(
socket_timeout: 5, connect_timeout: 5
)
)
end

def bootstrap_client
Expand Down
1 change: 1 addition & 0 deletions spec/integration/reconnect_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
minimum_mri_version '3.0.0'

it 'recreates SRV monitor' do
skip 'https://jira.mongodb.org/browse/RUBY-3749'
wait_for_discovery

expect(client.cluster.topology).to be_a(expected_topology_cls)
Expand Down
4 changes: 2 additions & 2 deletions spec/integration/srv_monitoring_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
require_topology :sharded

it 'updates topology via SRV records' do

skip 'https://jira.mongodb.org/browse/RUBY-3749'
rules = [
['_mongodb._tcp.test-fake.test.build.10gen.cc', :srv,
[0, 0, 27999, 'localhost.test.build.10gen.cc'],
Expand Down Expand Up @@ -356,7 +356,7 @@
require_topology :replica_set

it 'updates topology via SRV records then stops SRV monitor' do

skip 'https://jira.mongodb.org/browse/RUBY-3749'
rules = [
['_mongodb._tcp.test-fake.test.build.10gen.cc', :srv,
[0, 0, 27999, 'localhost.test.build.10gen.cc'],
Expand Down
2 changes: 2 additions & 0 deletions spec/integration/ssl_uri_options_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
end

it 'successfully connects and runs an operation' do
skip 'https://jira.mongodb.org/browse/RUBY-3749'

client = new_local_client(uri)
expect { client[:foo].count_documents }.not_to raise_error
end
Expand Down
Loading
Loading