Skip to content

Commit eac5d9c

Browse files
comandeocomandeo
committed
Merge branch 'master' into 3612-otel
2 parents 9108e72 + a1c8faa commit eac5d9c

Some content is hidden

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

42 files changed

+826
-649
lines changed

‎.evergreen/config.yml‎

Lines changed: 30 additions & 207 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +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_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
128-
export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
129-
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
130-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
131-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
132124
EOT
133125
134126
# See what we've done
@@ -187,7 +179,7 @@ functions:
187179
export AWS_DEFAULT_REGION="${fle_aws_region}"
188180
fi
189181
export CSOT_SPEC_TESTS=1
190-
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" \
191183
.evergreen/run-tests.sh
192184
193185
"export FLE credentials":
@@ -349,7 +341,7 @@ functions:
349341
"upload test results":
350342
- command: attach.xunit_results
351343
params:
352-
file: ./src/rspec.xml
344+
file: ./src/tmp/*.xml
353345

354346
"delete private environment":
355347
- command: shell.exec
@@ -360,17 +352,6 @@ functions:
360352
script: |
361353
rm -f .env.private
362354
363-
"build and test docker image":
364-
- command: shell.exec
365-
type: test
366-
params:
367-
shell: bash
368-
working_dir: "src"
369-
script: |
370-
${PREPARE_SHELL}
371-
set -x
372-
.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}
373-
374355
"run benchmarks":
375356
- command: shell.exec
376357
type: test
@@ -401,23 +382,6 @@ functions:
401382
fi
402383
.evergreen/run-tests.sh
403384
404-
"run tests via docker":
405-
- command: shell.exec
406-
type: test
407-
params:
408-
shell: bash
409-
working_dir: "src"
410-
script: |
411-
${PREPARE_SHELL}
412-
# Needed for generating temporary aws credentials.
413-
if [ -n "${FLE}" ];
414-
then
415-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
416-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
417-
export AWS_DEFAULT_REGION="${fle_aws_region}"
418-
fi
419-
.evergreen/run-tests-docker.sh
420-
421385
"run AWS auth tests":
422386
- command: shell.exec
423387
type: test
@@ -438,16 +402,6 @@ functions:
438402
${PREPARE_SHELL}
439403
.evergreen/run-tests-kerberos-unit.sh
440404
441-
"run Kerberos integration tests":
442-
- command: shell.exec
443-
type: test
444-
params:
445-
shell: bash
446-
working_dir: "src"
447-
script: |
448-
${PREPARE_SHELL}
449-
.evergreen/run-tests-kerberos-integration.sh
450-
451405
"run Atlas tests":
452406
- command: shell.exec
453407
type: test
@@ -456,25 +410,16 @@ functions:
456410
working_dir: "src"
457411
script: |
458412
${PREPARE_SHELL}
459-
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-atlas.sh
460-
461-
"run serverless tests":
462-
- command: shell.exec
463-
type: test
464-
params:
465-
shell: bash
466-
working_dir: "src"
467-
script: |
468-
${PREPARE_SHELL}
469-
# Needed for generating temporary aws credentials.
470-
if [ -n "${FLE}" ];
471-
then
472-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
473-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
474-
export AWS_DEFAULT_REGION="${fle_aws_region}"
475-
fi
476-
477-
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
478423
479424
pre:
480425
- func: "fetch source"
@@ -485,89 +430,10 @@ post:
485430
# Removed, causing timeouts
486431
# - func: "upload working dir"
487432
- func: "upload mo artifacts"
488-
# - func: "upload test results"
433+
- func: "upload test results"
489434
- func: "upload test results to s3"
490435

491436
task_groups:
492-
- name: serverless_task_group
493-
setup_group_can_fail_task: true
494-
setup_group_timeout_secs: 1800 # 30 minutes
495-
setup_group:
496-
- func: "fetch source"
497-
- func: "create expansions"
498-
- command: ec2.assume_role
499-
params:
500-
role_arn: ${aws_test_secrets_role}
501-
- command: shell.exec
502-
params:
503-
shell: "bash"
504-
script: |
505-
${PREPARE_SHELL}
506-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
507-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
508-
- command: expansions.update
509-
params:
510-
file: serverless-expansion.yml
511-
teardown_task:
512-
- command: shell.exec
513-
params:
514-
script: |
515-
${PREPARE_SHELL}
516-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
517-
- func: "upload test results"
518-
tasks:
519-
- "test-serverless"
520-
521-
- name: testatlas_task_group
522-
setup_group_can_fail_task: true
523-
setup_group_timeout_secs: 1800 # 30 minutes
524-
setup_group:
525-
- func: fetch source
526-
- func: create expansions
527-
- command: shell.exec
528-
params:
529-
shell: "bash"
530-
working_dir: "src"
531-
script: |
532-
${PREPARE_SHELL}
533-
534-
echo "Setting up Atlas cluster"
535-
536-
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
537-
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
538-
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
539-
DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
540-
DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
541-
DRIVERS_ATLAS_BASE_URL="${DRIVERS_ATLAS_BASE_URL}" \
542-
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
543-
MONGODB_VERSION="7.0" \
544-
task_id="${task_id}" \
545-
execution="${execution}" \
546-
$DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
547-
548-
echo "MONGODB_URI=${MONGODB_URI}"
549-
- command: expansions.update
550-
params:
551-
file: src/atlas-expansion.yml
552-
teardown_group:
553-
- command: shell.exec
554-
params:
555-
shell: "bash"
556-
working_dir: "src"
557-
script: |
558-
${PREPARE_SHELL}
559-
560-
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
561-
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
562-
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
563-
DRIVERS_ATLAS_BASE_URL="${DRIVERS_ATLAS_BASE_URL}" \
564-
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
565-
task_id="${task_id}" \
566-
execution="${execution}" \
567-
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
568-
tasks:
569-
- test-atlas
570-
571437
- name: testatlas_full_task_group
572438
setup_group_can_fail_task: true
573439
setup_group_timeout_secs: 1800 # 30 minutes
@@ -753,26 +619,12 @@ tasks:
753619
- name: "test-atlas"
754620
commands:
755621
- func: "run Atlas tests"
756-
- name: "test-serverless"
757-
commands:
758-
- func: "export FLE credentials"
759-
- func: "run serverless tests"
760-
- name: "test-docker"
761-
commands:
762-
- func: "build and test docker image"
763622
- name: "test-mlaunch"
764623
commands:
765624
- func: "run tests"
766625
- name: "driver-bench"
767626
commands:
768627
- func: "run benchmarks"
769-
- name: "test-via-docker"
770-
commands:
771-
- func: "run tests via docker"
772-
- name: "test-kerberos-integration"
773-
commands:
774-
- func: "export Kerberos credentials"
775-
- func: "run Kerberos integration tests"
776628
- name: "test-kerberos"
777629
commands:
778630
- func: "run Kerberos unit tests"
@@ -783,10 +635,6 @@ tasks:
783635
commands:
784636
- func: "export FLE credentials"
785637
- func: "run tests"
786-
- name: "test-fle-via-docker"
787-
commands:
788-
- func: "export FLE credentials"
789-
- func: "run tests via docker"
790638
- name: "test-aws-auth"
791639
commands:
792640
- func: "export AWS auth credentials"
@@ -913,11 +761,6 @@ axes:
913761
- id: "mongodb-version"
914762
display_name: MongoDB Version
915763
values:
916-
- id: "latest"
917-
display_name: "latest"
918-
variables:
919-
MONGODB_VERSION: "latest"
920-
CRYPT_SHARED_VERSION: "latest"
921764
- id: "8.0"
922765
display_name: "8.0"
923766
variables:
@@ -1216,7 +1059,7 @@ axes:
12161059
values:
12171060
- id: mmapv1
12181061
display_name: MMAPv1
1219-
run_on: ubuntu1804-small
1062+
run_on: ubuntu2004-small
12201063
variables:
12211064
MMAPV1: 'true'
12221065

@@ -1331,7 +1174,7 @@ buildvariants:
13311174
matrix_spec:
13321175
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
13331176
ruby: "ruby-3.3"
1334-
mongodb-version: ["latest", "8.0", "7.0"]
1177+
mongodb-version: ["8.0", "7.0"]
13351178
topology: ["standalone", "replica-set", "sharded-cluster"]
13361179
os: ubuntu2204
13371180
display_name: ${auth-and-ssl} ${ruby} db-${mongodb-version} ${topology}
@@ -1341,7 +1184,7 @@ buildvariants:
13411184
- matrix_name: "mongo-recent"
13421185
matrix_spec:
13431186
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
1344-
mongodb-version: ["latest", "8.0", "7.0"]
1187+
mongodb-version: ["8.0", "7.0"]
13451188
topology: ["standalone", "replica-set", "sharded-cluster"]
13461189
os: ubuntu2204
13471190
display_name: "${mongodb-version} ${os} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1360,28 +1203,18 @@ buildvariants:
13601203

13611204
- matrix_name: "mongo-5.x"
13621205
matrix_spec:
1363-
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
1206+
ruby: ["ruby-3.3", "ruby-3.2"]
13641207
mongodb-version: ['5.0']
13651208
topology: ["standalone", "replica-set", "sharded-cluster"]
1366-
os: ubuntu1804
1209+
os: ubuntu2004
13671210
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
13681211
tasks:
13691212
- name: "test-mlaunch"
13701213

13711214
- matrix_name: "mongo-4.x"
13721215
matrix_spec:
13731216
ruby: ["ruby-3.0", "ruby-2.7"]
1374-
mongodb-version: ['4.4', '4.2', '4.0']
1375-
topology: ["standalone", "replica-set", "sharded-cluster"]
1376-
os: ubuntu1804
1377-
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
1378-
tasks:
1379-
- name: "test-mlaunch"
1380-
1381-
- matrix_name: "mongo-3.6"
1382-
matrix_spec:
1383-
ruby: "ruby-2.7"
1384-
mongodb-version: ['3.6']
1217+
mongodb-version: ['4.4', '4.2']
13851218
topology: ["standalone", "replica-set", "sharded-cluster"]
13861219
os: ubuntu1804
13871220
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
@@ -1453,17 +1286,6 @@ buildvariants:
14531286
tasks:
14541287
- name: "test-mlaunch"
14551288

1456-
- matrix_name: mmapv1
1457-
matrix_spec:
1458-
ruby: "ruby-2.7"
1459-
mongodb-version: ['3.6', '4.0']
1460-
topology: ["standalone", "replica-set", "sharded-cluster"]
1461-
storage-engine: mmapv1
1462-
os: ubuntu1804
1463-
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
1464-
tasks:
1465-
- name: "test-mlaunch"
1466-
14671289
- matrix_name: "lint"
14681290
matrix_spec:
14691291
lint: on
@@ -1501,7 +1323,7 @@ buildvariants:
15011323
matrix_spec:
15021324
stress: on
15031325
ruby: "ruby-2.7"
1504-
mongodb-version: ['4.2', '4.0', '3.6']
1326+
mongodb-version: ['4.4', '4.2']
15051327
topology: replica-set
15061328
os: ubuntu1804
15071329
display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1946,14 +1768,15 @@ buildvariants:
19461768
matrix_spec:
19471769
ruby: ["ruby-3.3", "ruby-3.2", "ruby-3.1"]
19481770
os: ubuntu2204
1949-
display_name: "Atlas tests ${ruby}"
1771+
display_name: "Atlas connectivity tests ${ruby}"
19501772
tasks:
1951-
- name: testatlas_task_group
1773+
- name: test-atlas
19521774

1953-
- matrix_name: "aws-lambda"
1954-
matrix_spec:
1955-
ruby: 'ruby-3.2'
1956-
os: ubuntu2204
1957-
display_name: "AWS Lambda"
1958-
tasks:
1959-
- 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

0 commit comments

Comments
 (0)