Skip to content

Commit 7bf705a

Browse files
comandeo-mongoCopilot
comandeo-mongo
and
Copilot
authored
RUBY-3727 Use orchestration for ssl configs (#2974)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent fd66cce commit 7bf705a

File tree

9 files changed

+94
-163
lines changed

9 files changed

+94
-163
lines changed

‎.evergreen/config.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ functions:
379379
params:
380380
binary: bash
381381
working_dir: "src"
382-
include_expansions_in_env: [MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
382+
include_expansions_in_env: [DRIVERS_TOOLS, MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
383383
args:
384384
- ".evergreen/run-tests-new.sh"
385385
"run tests":
@@ -1189,7 +1189,7 @@ buildvariants:
11891189
os: ubuntu2204
11901190
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
11911191
tasks:
1192-
- name: "test-mlaunch"
1192+
- name: "run-main-test-suite"
11931193

11941194
- matrix_name: "mongo-recent"
11951195
matrix_spec:
@@ -1381,7 +1381,7 @@ buildvariants:
13811381
os: ubuntu2204
13821382
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
13831383
tasks:
1384-
- name: "test-mlaunch"
1384+
- name: "run-main-test-suite"
13851385

13861386
- matrix_name: zlib-"ruby-3.3"
13871387
matrix_spec:
@@ -1393,7 +1393,7 @@ buildvariants:
13931393
os: ubuntu2204
13941394
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
13951395
tasks:
1396-
- name: "test-mlaunch"
1396+
- name: "run-main-test-suite"
13971397

13981398
- matrix_name: snappy-"ruby-3.3"
13991399
matrix_spec:
@@ -1405,7 +1405,7 @@ buildvariants:
14051405
os: ubuntu2204
14061406
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
14071407
tasks:
1408-
- name: "test-mlaunch"
1408+
- name: "run-main-test-suite"
14091409

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

14261426
- matrix_name: activesupport-"ruby-3.3"
14271427
matrix_spec:
@@ -1454,7 +1454,7 @@ buildvariants:
14541454
os: ubuntu2004
14551455
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
14561456
tasks:
1457-
- name: "test-mlaunch"
1457+
- name: "run-main-test-suite"
14581458

14591459
- matrix_name: snappy-"ruby-2.7"
14601460
matrix_spec:
@@ -1466,7 +1466,7 @@ buildvariants:
14661466
os: ubuntu2004
14671467
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
14681468
tasks:
1469-
- name: "test-mlaunch"
1469+
- name: "run-main-test-suite"
14701470

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

14871487
- matrix_name: activesupport-"ruby-2.7"
14881488
matrix_spec:

‎.evergreen/config/common.yml.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ functions:
376376
params:
377377
binary: bash
378378
working_dir: "src"
379-
include_expansions_in_env: [MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
379+
include_expansions_in_env: [DRIVERS_TOOLS, MONGODB_URI, AUTH, SSL, TOPOLOGY, COMPRESSOR, RVM_RUBY]
380380
args:
381381
- ".evergreen/run-tests-new.sh"
382382
"run tests":

‎.evergreen/config/standard.yml.erb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ buildvariants:
5959
os: ubuntu2204
6060
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
6161
tasks:
62-
- name: "test-mlaunch"
62+
- name: "run-main-test-suite"
6363

6464
- matrix_name: "mongo-recent"
6565
matrix_spec:
@@ -251,7 +251,7 @@ buildvariants:
251251
os: ubuntu2204
252252
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
253253
tasks:
254-
- name: "test-mlaunch"
254+
- name: "run-main-test-suite"
255255

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

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

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

301301
- matrix_name: <%= "activesupport-#{rubies}" %>
302302
matrix_spec:

‎.evergreen/lib/server_setup.rb‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
require 'mongo'
2+
require_relative '../../spec/support/utils'
3+
require_relative '../../spec/support/spec_setup'
24

35
Mongo::Logger.logger.level = :WARN
46

@@ -88,7 +90,12 @@ def env_true?(key)
8890
end
8991

9092
def client
91-
@client ||= Mongo::Client.new(ENV.fetch('MONGODB_URI'))
93+
@client ||= Mongo::Client.new(
94+
SpecConfig.instance.addresses,
95+
SpecConfig.instance.all_test_options.merge(
96+
socket_timeout: 5, connect_timeout: 5
97+
)
98+
)
9299
end
93100

94101
def bootstrap_client

‎spec/integration/reconnect_spec.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
minimum_mri_version '3.0.0'
115115

116116
it 'recreates SRV monitor' do
117+
skip 'https://jira.mongodb.org/browse/RUBY-3749'
117118
wait_for_discovery
118119

119120
expect(client.cluster.topology).to be_a(expected_topology_cls)

‎spec/integration/srv_monitoring_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
require_topology :sharded
308308

309309
it 'updates topology via SRV records' do
310-
310+
skip 'https://jira.mongodb.org/browse/RUBY-3749'
311311
rules = [
312312
['_mongodb._tcp.test-fake.test.build.10gen.cc', :srv,
313313
[0, 0, 27999, 'localhost.test.build.10gen.cc'],
@@ -356,7 +356,7 @@
356356
require_topology :replica_set
357357

358358
it 'updates topology via SRV records then stops SRV monitor' do
359-
359+
skip 'https://jira.mongodb.org/browse/RUBY-3749'
360360
rules = [
361361
['_mongodb._tcp.test-fake.test.build.10gen.cc', :srv,
362362
[0, 0, 27999, 'localhost.test.build.10gen.cc'],

‎spec/integration/ssl_uri_options_spec.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
end
2323

2424
it 'successfully connects and runs an operation' do
25+
skip 'https://jira.mongodb.org/browse/RUBY-3749'
26+
2527
client = new_local_client(uri)
2628
expect { client[:foo].count_documents }.not_to raise_error
2729
end

0 commit comments

Comments
 (0)