Skip to content

Commit ea51fdf

Browse files
comandeo-mongocomandeo-mongo
committed
Merge branch 'master' into 3683
2 parents 8dbcfca + a1c8faa commit ea51fdf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1009
-825
lines changed

‎.evergreen/config.yml‎

Lines changed: 30 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,7 @@ functions:
120120
export ATLAS_FREE_TIER_URI="${atlas_free_tier_uri}"
121121
export ATLAS_TLS11_URI="${atlas_tls11_uri}"
122122
export ATLAS_TLS12_URI="${atlas_tls12_uri}"
123-
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
124-
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
125123
export RVM_RUBY="${RVM_RUBY}"
126-
127-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
128-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
129124
EOT
130125
131126
# See what we've done
@@ -184,7 +179,7 @@ functions:
184179
export AWS_DEFAULT_REGION="${fle_aws_region}"
185180
fi
186181
export CSOT_SPEC_TESTS=1
187-
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb" \
182+
TEST_CMD="bundle exec rspec spec/spec_tests/client_side_operations_timeout_spec.rb --format Rfc::Riff --format RspecJunitFormatter --out tmp/rspec.xml" \
188183
.evergreen/run-tests.sh
189184
190185
"export FLE credentials":
@@ -346,7 +341,7 @@ functions:
346341
"upload test results":
347342
- command: attach.xunit_results
348343
params:
349-
file: ./src/rspec.xml
344+
file: ./src/tmp/*.xml
350345

351346
"delete private environment":
352347
- command: shell.exec
@@ -357,17 +352,6 @@ functions:
357352
script: |
358353
rm -f .env.private
359354
360-
"build and test docker image":
361-
- command: shell.exec
362-
type: test
363-
params:
364-
shell: bash
365-
working_dir: "src"
366-
script: |
367-
${PREPARE_SHELL}
368-
set -x
369-
.evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
370-
371355
"run benchmarks":
372356
- command: shell.exec
373357
type: test
@@ -398,23 +382,6 @@ functions:
398382
fi
399383
.evergreen/run-tests.sh
400384
401-
"run tests via docker":
402-
- command: shell.exec
403-
type: test
404-
params:
405-
shell: bash
406-
working_dir: "src"
407-
script: |
408-
${PREPARE_SHELL}
409-
# Needed for generating temporary aws credentials.
410-
if [ -n "${FLE}" ];
411-
then
412-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
413-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
414-
export AWS_DEFAULT_REGION="${fle_aws_region}"
415-
fi
416-
.evergreen/run-tests-docker.sh
417-
418385
"run AWS auth tests":
419386
- command: shell.exec
420387
type: test
@@ -435,16 +402,6 @@ functions:
435402
${PREPARE_SHELL}
436403
.evergreen/run-tests-kerberos-unit.sh
437404
438-
"run Kerberos integration tests":
439-
- command: shell.exec
440-
type: test
441-
params:
442-
shell: bash
443-
working_dir: "src"
444-
script: |
445-
${PREPARE_SHELL}
446-
.evergreen/run-tests-kerberos-integration.sh
447-
448405
"run Atlas tests":
449406
- command: shell.exec
450407
type: test
@@ -453,25 +410,16 @@ functions:
453410
working_dir: "src"
454411
script: |
455412
${PREPARE_SHELL}
456-
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-atlas.sh
457-
458-
"run serverless tests":
459-
- command: shell.exec
460-
type: test
461-
params:
462-
shell: bash
463-
working_dir: "src"
464-
script: |
465-
${PREPARE_SHELL}
466-
# Needed for generating temporary aws credentials.
467-
if [ -n "${FLE}" ];
468-
then
469-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
470-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
471-
export AWS_DEFAULT_REGION="${fle_aws_region}"
472-
fi
473-
474-
CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
413+
AUTH=${AUTH} SSL=${SSL} TOPOLOGY=${TOPOLOGY} RVM_RUBY="${RVM_RUBY}" \
414+
ATLAS_REPLICA_SET_URI=${atlas_replica_set_uri} ATLAS_SHARDED_URI=${atlas_sharded_uri} \
415+
ATLAS_FREE_TIER_URI=${atlas_free_tier_uri} ATLAS_TLS11_URI=${atlas_tls11_uri} \
416+
ATLAS_TLS12_URI=${atlas_tls12_uri} ATLAS_SERVERLESS_URI=${atlas_serverless_uri} \
417+
ATLAS_SERVERLESS_LB_URI=${atlas_serverless_lb_uri} \
418+
ATLAS_X509_CERT_BASE64="${atlas_x509_cert_base64}" \
419+
ATLAS_X509_URI="${atlas_x509}" \
420+
ATLAS_X509_DEV_CERT_BASE64="${atlas_x509_dev_cert_base64}" \
421+
ATLAS_X509_DEV_URI="${atlas_x509_dev}" \
422+
.evergreen/run-tests-atlas.sh
475423
476424
pre:
477425
- func: "fetch source"
@@ -482,89 +430,10 @@ post:
482430
# Removed, causing timeouts
483431
# - func: "upload working dir"
484432
- func: "upload mo artifacts"
485-
# - func: "upload test results"
433+
- func: "upload test results"
486434
- func: "upload test results to s3"
487435

488436
task_groups:
489-
- name: serverless_task_group
490-
setup_group_can_fail_task: true
491-
setup_group_timeout_secs: 1800 # 30 minutes
492-
setup_group:
493-
- func: "fetch source"
494-
- func: "create expansions"
495-
- command: ec2.assume_role
496-
params:
497-
role_arn: ${aws_test_secrets_role}
498-
- command: shell.exec
499-
params:
500-
shell: "bash"
501-
script: |
502-
${PREPARE_SHELL}
503-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
504-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
505-
- command: expansions.update
506-
params:
507-
file: serverless-expansion.yml
508-
teardown_task:
509-
- command: shell.exec
510-
params:
511-
script: |
512-
${PREPARE_SHELL}
513-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
514-
- func: "upload test results"
515-
tasks:
516-
- "test-serverless"
517-
518-
- name: testatlas_task_group
519-
setup_group_can_fail_task: true
520-
setup_group_timeout_secs: 1800 # 30 minutes
521-
setup_group:
522-
- func: fetch source
523-
- func: create expansions
524-
- command: shell.exec
525-
params:
526-
shell: "bash"
527-
working_dir: "src"
528-
script: |
529-
${PREPARE_SHELL}
530-
531-
echo "Setting up Atlas cluster"
532-
533-
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
534-
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
535-
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
536-
DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
537-
DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
538-
DRIVERS_ATLAS_BASE_URL="${DRIVERS_ATLAS_BASE_URL}" \
539-
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
540-
MONGODB_VERSION="7.0" \
541-
task_id="${task_id}" \
542-
execution="${execution}" \
543-
$DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
544-
545-
echo "MONGODB_URI=${MONGODB_URI}"
546-
- command: expansions.update
547-
params:
548-
file: src/atlas-expansion.yml
549-
teardown_group:
550-
- command: shell.exec
551-
params:
552-
shell: "bash"
553-
working_dir: "src"
554-
script: |
555-
${PREPARE_SHELL}
556-
557-
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
558-
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
559-
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
560-
DRIVERS_ATLAS_BASE_URL="${DRIVERS_ATLAS_BASE_URL}" \
561-
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
562-
task_id="${task_id}" \
563-
execution="${execution}" \
564-
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
565-
tasks:
566-
- test-atlas
567-
568437
- name: testatlas_full_task_group
569438
setup_group_can_fail_task: true
570439
setup_group_timeout_secs: 1800 # 30 minutes
@@ -750,26 +619,12 @@ tasks:
750619
- name: "test-atlas"
751620
commands:
752621
- func: "run Atlas tests"
753-
- name: "test-serverless"
754-
commands:
755-
- func: "export FLE credentials"
756-
- func: "run serverless tests"
757-
- name: "test-docker"
758-
commands:
759-
- func: "build and test docker image"
760622
- name: "test-mlaunch"
761623
commands:
762624
- func: "run tests"
763625
- name: "driver-bench"
764626
commands:
765627
- func: "run benchmarks"
766-
- name: "test-via-docker"
767-
commands:
768-
- func: "run tests via docker"
769-
- name: "test-kerberos-integration"
770-
commands:
771-
- func: "export Kerberos credentials"
772-
- func: "run Kerberos integration tests"
773628
- name: "test-kerberos"
774629
commands:
775630
- func: "run Kerberos unit tests"
@@ -780,10 +635,6 @@ tasks:
780635
commands:
781636
- func: "export FLE credentials"
782637
- func: "run tests"
783-
- name: "test-fle-via-docker"
784-
commands:
785-
- func: "export FLE credentials"
786-
- func: "run tests via docker"
787638
- name: "test-aws-auth"
788639
commands:
789640
- func: "export AWS auth credentials"
@@ -910,11 +761,6 @@ axes:
910761
- id: "mongodb-version"
911762
display_name: MongoDB Version
912763
values:
913-
- id: "latest"
914-
display_name: "latest"
915-
variables:
916-
MONGODB_VERSION: "latest"
917-
CRYPT_SHARED_VERSION: "latest"
918764
- id: "8.0"
919765
display_name: "8.0"
920766
variables:
@@ -1213,7 +1059,7 @@ axes:
12131059
values:
12141060
- id: mmapv1
12151061
display_name: MMAPv1
1216-
run_on: ubuntu1804-small
1062+
run_on: ubuntu2004-small
12171063
variables:
12181064
MMAPV1: 'true'
12191065

@@ -1328,7 +1174,7 @@ buildvariants:
13281174
matrix_spec:
13291175
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
13301176
ruby: "ruby-3.3"
1331-
mongodb-version: ["latest", "8.0", "7.0"]
1177+
mongodb-version: ["8.0", "7.0"]
13321178
topology: ["standalone", "replica-set", "sharded-cluster"]
13331179
os: ubuntu2204
13341180
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1338,7 +1184,7 @@ buildvariants:
13381184
- matrix_name: "mongo-recent"
13391185
matrix_spec:
13401186
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
1341-
mongodb-version: ["latest", "8.0", "7.0"]
1187+
mongodb-version: ["8.0", "7.0"]
13421188
topology: ["standalone", "replica-set", "sharded-cluster"]
13431189
os: ubuntu2204
13441190
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1357,28 +1203,18 @@ buildvariants:
13571203

13581204
- matrix_name: "mongo-5.x"
13591205
matrix_spec:
1360-
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
1206+
ruby: ["ruby-3.3", "ruby-3.2"]
13611207
mongodb-version: ['5.0']
13621208
topology: ["standalone", "replica-set", "sharded-cluster"]
1363-
os: ubuntu1804
1209+
os: ubuntu2004
13641210
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
13651211
tasks:
13661212
- name: "test-mlaunch"
13671213

13681214
- matrix_name: "mongo-4.x"
13691215
matrix_spec:
13701216
ruby: ["ruby-3.0", "ruby-2.7"]
1371-
mongodb-version: ['4.4', '4.2', '4.0']
1372-
topology: ["standalone", "replica-set", "sharded-cluster"]
1373-
os: ubuntu1804
1374-
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
1375-
tasks:
1376-
- name: "test-mlaunch"
1377-
1378-
- matrix_name: "mongo-3.6"
1379-
matrix_spec:
1380-
ruby: "ruby-2.7"
1381-
mongodb-version: ['3.6']
1217+
mongodb-version: ['4.4', '4.2']
13821218
topology: ["standalone", "replica-set", "sharded-cluster"]
13831219
os: ubuntu1804
13841220
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1450,17 +1286,6 @@ buildvariants:
14501286
tasks:
14511287
- name: "test-mlaunch"
14521288

1453-
- matrix_name: mmapv1
1454-
matrix_spec:
1455-
ruby: "ruby-2.7"
1456-
mongodb-version: ['3.6', '4.0']
1457-
topology: ["standalone", "replica-set", "sharded-cluster"]
1458-
storage-engine: mmapv1
1459-
os: ubuntu1804
1460-
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
1461-
tasks:
1462-
- name: "test-mlaunch"
1463-
14641289
- matrix_name: "lint"
14651290
matrix_spec:
14661291
lint: on
@@ -1498,7 +1323,7 @@ buildvariants:
14981323
matrix_spec:
14991324
stress: on
15001325
ruby: "ruby-2.7"
1501-
mongodb-version: ['4.2', '4.0', '3.6']
1326+
mongodb-version: ['4.4', '4.2']
15021327
topology: replica-set
15031328
os: ubuntu1804
15041329
display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1943,14 +1768,15 @@ buildvariants:
19431768
matrix_spec:
19441769
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
19451770
os: ubuntu2204
1946-
display_name: "Atlas tests ${ruby}"
1771+
display_name: "Atlas connectivity tests ${ruby}"
19471772
tasks:
1948-
- name: testatlas_task_group
1773+
- name: test-atlas
19491774

1950-
- matrix_name: "aws-lambda"
1951-
matrix_spec:
1952-
ruby: 'ruby-3.2'
1953-
os: ubuntu2204
1954-
display_name: "AWS Lambda"
1955-
tasks:
1956-
- name: test_aws_lambda_task_group
1775+
# https://jira.mongodb.org/browse/RUBY-3311
1776+
# - matrix_name: "aws-lambda"
1777+
# matrix_spec:
1778+
# ruby: 'ruby-3.2'
1779+
# os: ubuntu2204
1780+
# display_name: "AWS Lambda"
1781+
# tasks:
1782+
# - name: test_aws_lambda_task_group

‎.evergreen/config/axes.yml.erb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ axes:
1313
- id: "mongodb-version"
1414
display_name: MongoDB Version
1515
values:
16-
- id: "latest"
17-
display_name: "latest"
18-
variables:
19-
MONGODB_VERSION: "latest"
20-
CRYPT_SHARED_VERSION: "latest"
2116
- id: "8.0"
2217
display_name: "8.0"
2318
variables:
@@ -314,7 +309,7 @@ axes:
314309
values:
315310
- id: mmapv1
316311
display_name: MMAPv1
317-
run_on: ubuntu1804-small
312+
run_on: ubuntu2004-small
318313
variables:
319314
MMAPV1: 'true'
320315

0 commit comments

Comments
 (0)