Skip to content

RUBY-3472 Migrate from mlaunch to drivers-tools orchestration #3053

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 10 commits into
base: master
Choose a base branch
from
Open

RUBY-3472 Migrate from mlaunch to drivers-tools orchestration #3053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abd09bf
RUBY-3472 Migrate from mlaunch to drivers-tools orchestration
comandeo-mongo May 28, 2026
96d2cc9
RUBY-3472 Export MONGODB_URI after sourcing mo-expansion.sh
comandeo-mongo May 28, 2026
518de95
RUBY-3472 Fix OCSP orchestration file name and add mkdir -p
comandeo-mongo May 28, 2026
f4e0009
RUBY-3472 Use run-mongodb.sh instead of run-orchestration.sh
comandeo-mongo May 28, 2026
b7a00f4
RUBY-3472 Fix ORCHESTRATION_FILE .json suffix and add waitress
comandeo-mongo May 28, 2026
39e1dde
RUBY-3472 Add tlsCAFile for OCSP connectivity tests
comandeo-mongo May 28, 2026
b840d23
RUBY-3472 Remove serverSelectionTimeoutMS from URI
comandeo-mongo May 28, 2026
af24730
RUBY-3472 Use OCSP CA for OCSP connectivity TLS verification
comandeo-mongo May 28, 2026
3ea5816
RUBY-3472 Set authMechanism=MONGODB-AWS for aws-ec2/ecs/web-identity
comandeo-mongo May 28, 2026
bbf4072
RUBY-3472 Remove unused single-node-ssl orchestration config
comandeo-mongo May 29, 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
78 changes: 31 additions & 47 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ functions:
export AUTH=${AUTH}
export SSL=${SSL}
export TOPOLOGY=${TOPOLOGY}
export MLAUNCH_TOPOLOGY=${MLAUNCH_TOPOLOGY}
export COMPRESSOR=${COMPRESSOR}
export RVM_RUBY="${RVM_RUBY}"
export MONGODB_VERSION=${MONGODB_VERSION}
Expand Down Expand Up @@ -169,8 +168,6 @@ functions:
script: |
${PREPARE_SHELL}
export CSOT_SPEC_TESTS=1
unset TOPOLOGY
export TOPOLOGY=${MLAUNCH_TOPOLOGY}
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml" \
.evergreen/run-tests.sh

Expand All @@ -183,8 +180,6 @@ functions:
script: |
${PREPARE_SHELL}
export OTEL_SPEC_TESTS=1
unset TOPOLOGY
export TOPOLOGY=${MLAUNCH_TOPOLOGY}
TEST_CMD="bundle exec rspec spec/spec_tests/open_telemetry_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml" \
.evergreen/run-tests.sh

Expand Down Expand Up @@ -313,8 +308,6 @@ functions:
working_dir: "src"
script: |
${PREPARE_SHELL}
unset TOPOLOGY
export TOPOLOGY=${MLAUNCH_TOPOLOGY}
TEST_CMD="bundle exec rake driver_bench" PERFORMANCE_RESULTS_FILE="$PROJECT_DIRECTORY/perf.json" .evergreen/run-tests.sh
- command: perf.send
params:
Expand Down Expand Up @@ -349,8 +342,6 @@ functions:
export MONGO_RUBY_DRIVER_GCP_KEY_NAME="${fle_gcp_key_name}"
export MONGO_RUBY_DRIVER_MONGOCRYPTD_PORT="${fle_mongocryptd_port}"
fi
unset TOPOLOGY
export TOPOLOGY=${MLAUNCH_TOPOLOGY}
.evergreen/run-tests.sh

"run AWS auth tests":
Expand All @@ -361,8 +352,6 @@ functions:
working_dir: "src"
script: |
${PREPARE_SHELL}
unset TOPOLOGY
export TOPOLOGY=${MLAUNCH_TOPOLOGY}
.evergreen/run-tests-aws-auth.sh

"run Kerberos unit tests":
Expand Down Expand Up @@ -599,7 +588,7 @@ tasks:
commands:
- func: "export Atlas credentials"
- func: "run Atlas tests"
- name: "test-mlaunch"
- name: "test"
commands:
- func: "run tests"
- name: "driver-bench"
Expand Down Expand Up @@ -776,27 +765,23 @@ axes:
display_name: Standalone
variables:
TOPOLOGY: server
MLAUNCH_TOPOLOGY: standalone
- id: "replica-set"
display_name: Replica Set
variables:
TOPOLOGY: replica_set
MLAUNCH_TOPOLOGY: replica-set
- id: "replica-set-single-node"
display_name: Replica Set (Single Node)
variables:
TOPOLOGY: replica-set-single-node
MLAUNCH_TOPOLOGY: replica-set-single-node
TOPOLOGY: replica_set
ORCHESTRATION_FILE: single-node.json
- id: "sharded-cluster"
display_name: Sharded
variables:
TOPOLOGY: sharded_cluster
MLAUNCH_TOPOLOGY: sharded-cluster
- id: "load-balanced"
display_name: Load Balanced
variables:
TOPOLOGY: sharded_cluster
MLAUNCH_TOPOLOGY: sharded-cluster
LOAD_BALANCED: 'true'

- id: "single-mongos"
Expand Down Expand Up @@ -1205,7 +1190,7 @@ buildvariants:
display_name: "${mongodb-version} ${topology} single-lb ${auth-and-ssl} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "mongo-api-version"
matrix_spec:
Expand All @@ -1217,7 +1202,7 @@ buildvariants:
display_name: "${mongodb-version} api-version-required ${topology} ${auth-and-ssl} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "single-mongos"
matrix_spec:
Expand All @@ -1229,7 +1214,7 @@ buildvariants:
display_name: "${mongodb-version} ${topology} single-mongos ${auth-and-ssl} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: CSOT
matrix_spec:
Expand Down Expand Up @@ -1263,7 +1248,7 @@ buildvariants:
display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "no-retry-writes"
matrix_spec:
Expand All @@ -1275,7 +1260,7 @@ buildvariants:
display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "lint"
matrix_spec:
Expand All @@ -1286,7 +1271,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "fork"
matrix_spec:
Expand All @@ -1297,7 +1282,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} fork ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "solo"
matrix_spec:
Expand All @@ -1308,7 +1293,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} solo ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "stress older"
matrix_spec:
Expand All @@ -1319,7 +1304,7 @@ buildvariants:
os: ubuntu1804
display_name: "${mongodb-version} ${topology} stress ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "stress"
matrix_spec:
Expand All @@ -1330,7 +1315,7 @@ buildvariants:
os: ubuntu2204
display_name: "${mongodb-version} ${topology} stress ${ruby}"
tasks:
- name: "test-mlaunch"
- name: "test"

# - matrix_name: "x509-tests"
# matrix_spec:
Expand All @@ -1341,7 +1326,7 @@ buildvariants:
# os: ubuntu2204
# display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
# tasks:
# - name: "test-mlaunch"
# - name: "test"

- matrix_name: zlib-"ruby-4.0"
matrix_spec:
Expand Down Expand Up @@ -1396,7 +1381,7 @@ buildvariants:
display_name: "AS ${mongodb-version} ${topology} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: bson-"ruby-4.0"
matrix_spec:
Expand All @@ -1408,7 +1393,7 @@ buildvariants:
display_name: "bson-${bson} ${mongodb-version} ${topology} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"
- matrix_name: zlib-"ruby-2.7"
matrix_spec:
auth-and-ssl: [ "auth-and-ssl", "noauth-and-nossl" ]
Expand Down Expand Up @@ -1462,7 +1447,7 @@ buildvariants:
display_name: "AS ${mongodb-version} ${topology} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: bson-"ruby-2.7"
matrix_spec:
Expand All @@ -1474,7 +1459,7 @@ buildvariants:
display_name: "bson-${bson} ${mongodb-version} ${topology} ${ruby}"
tags: ["pr"]
tasks:
- name: "test-mlaunch"
- name: "test"

- matrix_name: "fle"
matrix_spec:
Expand Down Expand Up @@ -1533,7 +1518,6 @@ buildvariants:
run_on: ubuntu2204-small
expansions:
TOPOLOGY: sharded_cluster
MLAUNCH_TOPOLOGY: sharded-cluster
RVM_RUBY: "ruby-4.0"
MONGODB_VERSION: 'latest'
tasks:
Expand Down Expand Up @@ -1566,7 +1550,7 @@ buildvariants:
display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test

- matrix_name: ocsp-must-staple
matrix_spec:
Expand All @@ -1580,7 +1564,7 @@ buildvariants:
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
tasks:
- name: test-mlaunch
- name: test

- matrix_name: ocsp-unknown
matrix_spec:
Expand All @@ -1593,7 +1577,7 @@ buildvariants:
auth-and-ssl: noauth-and-ssl
display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
tasks:
- name: test-mlaunch
- name: test

- matrix_name: ocsp-connectivity
matrix_spec:
Expand All @@ -1609,7 +1593,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1624,7 +1608,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1639,7 +1623,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1654,7 +1638,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1669,7 +1653,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1684,7 +1668,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1699,7 +1683,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1714,7 +1698,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test
- matrix_name: ocsp-connectivity
matrix_spec:
ocsp-algorithm: '*'
Expand All @@ -1729,7 +1713,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test

- matrix_name: ocsp-connectivity-jruby
matrix_spec:
Expand All @@ -1750,7 +1734,7 @@ buildvariants:
display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${mongodb-version} ${ruby}"
tags: ["pr"]
tasks:
- name: test-mlaunch
- name: test

# https://jira.mongodb.org/browse/RUBY-3540
#- matrix_name: testgcpkms-variant
Expand Down
8 changes: 2 additions & 6 deletions .evergreen/config/axes.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,23 @@ axes:
display_name: Standalone
variables:
TOPOLOGY: server
MLAUNCH_TOPOLOGY: standalone
- id: "replica-set"
display_name: Replica Set
variables:
TOPOLOGY: replica_set
MLAUNCH_TOPOLOGY: replica-set
- id: "replica-set-single-node"
display_name: Replica Set (Single Node)
variables:
TOPOLOGY: replica-set-single-node
MLAUNCH_TOPOLOGY: replica-set-single-node
TOPOLOGY: replica_set
ORCHESTRATION_FILE: single-node.json
- id: "sharded-cluster"
display_name: Sharded
variables:
TOPOLOGY: sharded_cluster
MLAUNCH_TOPOLOGY: sharded-cluster
- id: "load-balanced"
display_name: Load Balanced
variables:
TOPOLOGY: sharded_cluster
MLAUNCH_TOPOLOGY: sharded-cluster
LOAD_BALANCED: 'true'

- id: "single-mongos"
Expand Down
Loading
Loading