Skip to content

Commit 712024c

Browse files
authored
Merge branch 'master' into PYTHON-4493-prod
2 parents 7006cf4 + 2149567 commit 712024c

File tree

191 files changed

+4785
-2239
lines changed

Some content is hidden

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

191 files changed

+4785
-2239
lines changed

.evergreen/config.yml

Lines changed: 8 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ functions:
4242
# Make an evergreen expansion file with dynamic values
4343
- command: subprocess.exec
4444
params:
45-
include_expansions_in_env: ["is_patch", "project", "version_id", "skip_web_identity_auth_test", "skip_ECS_auth_test"]
45+
include_expansions_in_env: ["is_patch", "project", "version_id"]
4646
binary: bash
4747
working_dir: "src"
4848
args:
@@ -213,30 +213,14 @@ functions:
213213
params:
214214
file: ${DRIVERS_TOOLS}/mo-expansion.yml
215215

216-
"bootstrap data lake":
216+
"run just script":
217217
- command: subprocess.exec
218-
type: setup
219-
params:
220-
binary: bash
221-
args:
222-
- ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/pull-mongohouse-image.sh
223-
- command: subprocess.exec
224-
type: setup
218+
type: test
225219
params:
226-
binary: bash
227-
args:
228-
- ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/run-mongohouse-image.sh
229-
230-
"run doctests":
231-
- command: subprocess.exec
232-
type: test
233-
params:
234-
include_expansions_in_env: [ "PYTHON_BINARY" ]
235-
working_dir: "src"
236-
binary: bash
237-
args:
238-
- .evergreen/scripts/run-with-env.sh
239-
- .evergreen/scripts/run-doctests.sh
220+
include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
221+
binary: bash
222+
working_dir: "src"
223+
args: [.evergreen/just.sh, "${JUSTFILE_TARGET}"]
240224

241225
"run tests":
242226
- command: subprocess.exec
@@ -262,7 +246,6 @@ functions:
262246
binary: bash
263247
working_dir: "src"
264248
args:
265-
- .evergreen/scripts/run-with-env.sh
266249
- .evergreen/scripts/cleanup.sh
267250

268251
"teardown system":
@@ -282,38 +265,7 @@ functions:
282265
- command: ec2.assume_role
283266
params:
284267
role_arn: ${aws_test_secrets_role}
285-
286-
"setup atlas":
287-
- command: subprocess.exec
288-
params:
289-
binary: bash
290-
include_expansions_in_env: ["task_id", "execution"]
291-
env:
292-
MONGODB_VERSION: "7.0"
293-
LAMBDA_STACK_NAME: dbx-python-lambda
294-
args:
295-
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
296-
- command: expansions.update
297-
params:
298-
file: atlas-expansion.yml
299-
300-
"teardown atlas":
301-
- command: subprocess.exec
302-
params:
303-
binary: bash
304-
args:
305-
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
306-
307-
"run perf tests":
308-
- command: subprocess.exec
309-
type: test
310-
params:
311-
working_dir: "src"
312-
binary: bash
313-
include_expansions_in_env: [SUB_TEST_NAME]
314-
args:
315-
- .evergreen/scripts/run-with-env.sh
316-
- .evergreen/scripts/run-perf-tests.sh
268+
duration_seconds: 3600
317269

318270
"attach benchmark test results":
319271
- command: attach.results
@@ -339,31 +291,6 @@ post:
339291
- func: "upload test results"
340292
- func: "cleanup"
341293

342-
task_groups:
343-
- name: test_aws_lambda_task_group
344-
setup_group:
345-
- func: fetch source
346-
- func: setup system
347-
- func: setup atlas
348-
teardown_task:
349-
- func: teardown atlas
350-
setup_group_can_fail_task: true
351-
setup_group_timeout_secs: 1800
352-
tasks:
353-
- test-aws-lambda-deployed
354-
355-
- name: test_atlas_task_group_search_indexes
356-
setup_group:
357-
- func: fetch source
358-
- func: setup system
359-
- func: setup atlas
360-
teardown_task:
361-
- func: teardown atlas
362-
setup_group_can_fail_task: true
363-
setup_group_timeout_secs: 1800
364-
tasks:
365-
- test-search-index-helpers
366-
367294
tasks:
368295
# Wildcard task. Do you need to find out what tools are available and where?
369296
# Throw it here, and execute this task on all buildvariants
@@ -375,70 +302,7 @@ tasks:
375302
params:
376303
args:
377304
- src/.evergreen/scripts/run-getdata.sh
378-
# Standard test tasks {{{
379-
380-
- name: "mockupdb"
381-
tags: ["mockupdb"]
382-
commands:
383-
- func: "run tests"
384-
vars:
385-
TEST_NAME: mockupdb
386-
387-
- name: "doctests"
388-
tags: ["doctests"]
389-
commands:
390-
- func: "run server"
391-
- func: "run doctests"
392-
393-
- name: "test-search-index-helpers"
394-
commands:
395-
- func: "run server"
396-
vars:
397-
VERSION: "6.0"
398-
TOPOLOGY: "replica_set"
399-
- func: "run tests"
400-
vars:
401-
TEST_NAME: index_management
402-
AUTH: "auth"
403305

404-
- name: "no-server"
405-
tags: ["no-server"]
406-
commands:
407-
- func: "run tests"
408-
409-
- name: "free-threading"
410-
tags: ["free-threading"]
411-
commands:
412-
- func: "run server"
413-
vars:
414-
VERSION: "8.0"
415-
TOPOLOGY: "replica_set"
416-
- func: "run tests"
417-
418-
- name: atlas-data-lake-tests
419-
commands:
420-
- func: "bootstrap data lake"
421-
- func: "run tests"
422-
vars:
423-
TEST_NAME: "data_lake"
424-
425-
- name: "test-aws-lambda-deployed"
426-
commands:
427-
- command: ec2.assume_role
428-
params:
429-
role_arn: ${LAMBDA_AWS_ROLE_ARN}
430-
duration_seconds: 3600
431-
- command: subprocess.exec
432-
params:
433-
working_dir: src
434-
binary: bash
435-
add_expansions_to_env: true
436-
args:
437-
- .evergreen/run-deployed-lambda-aws-tests.sh
438-
env:
439-
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
440-
441-
# }}}
442306
- name: "coverage-report"
443307
tags: ["coverage"]
444308
depends_on:
@@ -461,84 +325,6 @@ tasks:
461325
commands:
462326
- func: "download and merge coverage"
463327

464-
- name: "perf-6.0-standalone"
465-
tags: ["perf"]
466-
commands:
467-
- func: "run server"
468-
vars:
469-
VERSION: "v6.0-perf"
470-
- func: "run perf tests"
471-
vars:
472-
SUB_TEST_NAME: "sync"
473-
- func: "attach benchmark test results"
474-
- func: "send dashboard data"
475-
476-
- name: "perf-6.0-standalone-ssl"
477-
tags: ["perf"]
478-
commands:
479-
- func: "run server"
480-
vars:
481-
VERSION: "v6.0-perf"
482-
SSL: "ssl"
483-
- func: "run perf tests"
484-
vars:
485-
SUB_TEST_NAME: "sync"
486-
- func: "attach benchmark test results"
487-
- func: "send dashboard data"
488-
489-
- name: "perf-8.0-standalone"
490-
tags: ["perf"]
491-
commands:
492-
- func: "run server"
493-
vars:
494-
VERSION: "8.0"
495-
- func: "run perf tests"
496-
vars:
497-
SUB_TEST_NAME: "sync"
498-
- func: "attach benchmark test results"
499-
- func: "send dashboard data"
500-
501-
- name: "perf-6.0-standalone-async"
502-
tags: [ "perf" ]
503-
commands:
504-
- func: "run server"
505-
vars:
506-
VERSION: "v6.0-perf"
507-
TOPOLOGY: "server"
508-
- func: "run perf tests"
509-
vars:
510-
SUB_TEST_NAME: "async"
511-
- func: "attach benchmark test results"
512-
- func: "send dashboard data"
513-
514-
- name: "perf-6.0-standalone-ssl-async"
515-
tags: [ "perf" ]
516-
commands:
517-
- func: "run server"
518-
vars:
519-
VERSION: "v6.0-perf"
520-
TOPOLOGY: "server"
521-
SSL: "ssl"
522-
- func: "run perf tests"
523-
vars:
524-
SUB_TEST_NAME: "async"
525-
- func: "attach benchmark test results"
526-
- func: "send dashboard data"
527-
528-
- name: "perf-8.0-standalone-async"
529-
tags: [ "perf" ]
530-
commands:
531-
- func: "run server"
532-
vars:
533-
VERSION: "8.0"
534-
TOPOLOGY: "server"
535-
- func: "run perf tests"
536-
vars:
537-
SUB_TEST_NAME: "async"
538-
- func: "attach benchmark test results"
539-
- func: "send dashboard data"
540-
541-
542328
- name: "check-import-time"
543329
tags: ["pr"]
544330
commands:
@@ -566,12 +352,6 @@ tasks:
566352
- ${github_commit}
567353

568354
buildvariants:
569-
- name: "no-server"
570-
display_name: "No server"
571-
run_on:
572-
- rhel84-small
573-
tasks:
574-
- name: "no-server"
575355

576356
- name: "Coverage Report"
577357
display_name: "Coverage Report"
@@ -592,12 +372,6 @@ buildvariants:
592372
batchtime: 10080 # 7 days
593373
- name: test-azurekms-fail
594374

595-
- name: rhel8-test-lambda
596-
display_name: FaaS Lambda
597-
run_on: rhel87-small
598-
tasks:
599-
- name: test_aws_lambda_task_group
600-
601375
- name: rhel8-import-time
602376
display_name: Import Time
603377
run_on: rhel87-small
@@ -610,15 +384,3 @@ buildvariants:
610384
- rhel8.7-small
611385
tasks:
612386
- name: "backport-pr"
613-
614-
- name: "perf-tests"
615-
display_name: "Performance Benchmarks"
616-
batchtime: 10080 # 7 days
617-
run_on: rhel90-dbx-perf-large
618-
tasks:
619-
- name: "perf-6.0-standalone"
620-
- name: "perf-6.0-standalone-ssl"
621-
- name: "perf-8.0-standalone"
622-
- name: "perf-6.0-standalone-async"
623-
- name: "perf-6.0-standalone-ssl-async"
624-
- name: "perf-8.0-standalone-async"

0 commit comments

Comments
 (0)