Skip to content

Commit 927ab22

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.29-releases
2 parents 3d99824 + c88b931 commit 927ab22

File tree

41 files changed

+1742
-116
lines changed

Some content is hidden

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

41 files changed

+1742
-116
lines changed

.evergreen.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ post:
2727
params:
2828
local_files_include_filter:
2929
- src/packages/compass-e2e-tests/.log/**/*.log
30+
- src/packages/compass-e2e-tests/.log/**/*.json
3031
- <<: *save-diagnostic-file
3132
params:
3233
local_files_include_filter:
3334
- ~/.mongodb/runner/*.log
35+
- command: attach.results
36+
params:
37+
file_location: src/packages/compass-e2e-tests/.log/report.json
3438

3539
functions:
3640
'prepare':
@@ -187,6 +191,7 @@ functions:
187191
188192
bash .evergreen/pretest.sh
189193
194+
export E2E_TESTS_METRICS_URI="${e2e_tests_metrics_string}"
190195
export E2E_TESTS_ATLAS_HOST="${e2e_tests_atlas_host}"
191196
export E2E_TESTS_DATA_LAKE_HOST="${e2e_tests_data_lake_host}"
192197
export E2E_TESTS_SERVERLESS_HOST="${e2e_tests_serverless_host}"
@@ -411,7 +416,7 @@ tasks:
411416

412417
- func: test
413418
vars:
414-
debug: 'hadron*,mongo*'
419+
debug: 'hadron*,mongo*,compass-e2e-tests*'
415420

416421
- func: package
417422
vars:

.github/workflows/build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272

7373
- name: Test Packaged Application
7474
env:
75+
E2E_TESTS_METRICS_URI: ${{ secrets.E2E_TESTS_METRICS_URI }}
7576
E2E_TESTS_ATLAS_HOST: ${{ secrets.E2E_TESTS_ATLAS_HOST }}
7677
E2E_TESTS_DATA_LAKE_HOST: ${{ secrets.E2E_TESTS_DATA_LAKE_HOST }}
7778
E2E_TESTS_ANALYTICS_NODE_HOST: ${{ secrets.E2E_TESTS_ANALYTICS_NODE_HOST }}

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **compass**.
2-
This document was automatically generated on Mon Nov 15 2021.
2+
This document was automatically generated on Tue Nov 16 2021.
33

44
## List of dependencies
55

0 commit comments

Comments
 (0)