Skip to content

Commit 309c6de

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 9a94a8e + dbedce1 commit 309c6de

Some content is hidden

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

46 files changed

+1315
-8264
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,6 @@ buildvariants:
246246
- name: e2e-coverage-<%= group.number %>
247247
<% } %>
248248

249-
- name: e2e-multiple-connections
250-
display_name: E2E Multiple Connections
251-
run_on: ubuntu2004-large
252-
tasks:
253-
<% for(const group of E2E_TEST_GROUPS) { %>
254-
- name: e2e-multiple-connections-<%= group.number %>
255-
<% } %>
256-
257249
- name: csfle-tests
258250
display_name: CSFLE Tests
259251
run_on: ubuntu2004-large
@@ -340,21 +332,6 @@ tasks:
340332
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
341333
<% } %>
342334

343-
<% for(const group of E2E_TEST_GROUPS) { %>
344-
- name: e2e-multiple-connections-<%= group.number %>
345-
tags: ['required-for-publish', 'run-on-pr']
346-
commands:
347-
- func: prepare
348-
- func: install
349-
- func: bootstrap
350-
- func: test-multiple-connections
351-
vars:
352-
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
353-
e2e_test_group: <%= group.number %>
354-
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
355-
mongodb_version: latest-enterprise
356-
<% } %>
357-
358335
- name: generate-vulnerability-report
359336
tags: ['required-for-publish', 'run-on-pr']
360337
commands:

.evergreen/buildvariants-and-tasks.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,6 @@ buildvariants:
220220
- name: e2e-coverage-1
221221
- name: e2e-coverage-2
222222
- name: e2e-coverage-3
223-
- name: e2e-multiple-connections
224-
display_name: E2E Multiple Connections
225-
run_on: ubuntu2004-large
226-
tasks:
227-
- name: e2e-multiple-connections-1
228-
- name: e2e-multiple-connections-2
229-
- name: e2e-multiple-connections-3
230223
- name: csfle-tests
231224
display_name: CSFLE Tests
232225
run_on: ubuntu2004-large
@@ -338,48 +331,6 @@ tasks:
338331
e2e_test_groups: 3
339332
e2e_test_group: 3
340333
debug: compass-e2e-tests*,electron*,hadron*,mongo*
341-
- name: e2e-multiple-connections-1
342-
tags:
343-
- required-for-publish
344-
- run-on-pr
345-
commands:
346-
- func: prepare
347-
- func: install
348-
- func: bootstrap
349-
- func: test-multiple-connections
350-
vars:
351-
e2e_test_groups: 3
352-
e2e_test_group: 1
353-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
354-
mongodb_version: latest-enterprise
355-
- name: e2e-multiple-connections-2
356-
tags:
357-
- required-for-publish
358-
- run-on-pr
359-
commands:
360-
- func: prepare
361-
- func: install
362-
- func: bootstrap
363-
- func: test-multiple-connections
364-
vars:
365-
e2e_test_groups: 3
366-
e2e_test_group: 2
367-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
368-
mongodb_version: latest-enterprise
369-
- name: e2e-multiple-connections-3
370-
tags:
371-
- required-for-publish
372-
- run-on-pr
373-
commands:
374-
- func: prepare
375-
- func: install
376-
- func: bootstrap
377-
- func: test-multiple-connections
378-
vars:
379-
e2e_test_groups: 3
380-
e2e_test_group: 3
381-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
382-
mongodb_version: latest-enterprise
383334
- name: generate-vulnerability-report
384335
tags:
385336
- required-for-publish

.evergreen/functions.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -602,30 +602,6 @@ functions:
602602
603603
tar czf coverage.tgz packages/compass-e2e-tests/coverage
604604
605-
test-multiple-connections:
606-
- command: shell.exec
607-
# Fail the task if it's idle for 10 mins
608-
timeout_secs: 600
609-
params:
610-
working_dir: src
611-
shell: bash
612-
env:
613-
<<: *compass-env
614-
DEBUG: ${debug|}
615-
MONGODB_VERSION: ${mongodb_version|}
616-
MONGODB_RUNNER_VERSION: ${mongodb_version|}
617-
E2E_TEST_GROUPS: ${e2e_test_groups}
618-
E2E_TEST_GROUP: ${e2e_test_group}
619-
HADRON_DISTRIBUTION: compass
620-
script: |
621-
set -e
622-
# Load environment variables
623-
eval $(.evergreen/print-compass-env.sh)
624-
625-
echo "Running E2E tests for multiple connections"
626-
627-
npm run --unsafe-perm --workspace compass-e2e-tests test-ci -- -- --test-multiple-connections
628-
629605
test-packaged-app:
630606
- command: shell.exec
631607
# Fail the task if it's idle for 10 mins
@@ -980,28 +956,3 @@ functions:
980956
# Fails if the report failed and is not a patch, including release branches:
981957
exit $return_code
982958
fi
983-
984-
generative-ai-accuracy-tests:
985-
- command: shell.exec
986-
# Fail the task if it's idle for 10 mins
987-
timeout_secs: 600
988-
params:
989-
working_dir: src
990-
shell: bash
991-
env:
992-
<<: *compass-env
993-
ATLAS_PUBLIC_KEY: ${atlas_public_key}
994-
ATLAS_PRIVATE_KEY: ${atlas_private_key}
995-
AI_ACCURACY_RESULTS_MONGODB_CONNECTION_STRING: ${accuracy_results_mdb_connection_string}
996-
script: |
997-
set -e
998-
# Load environment variables
999-
eval $(.evergreen/print-compass-env.sh)
1000-
1001-
set +e
1002-
npm run --workspace @mongodb-js/compass-generative-ai ai-accuracy-tests
1003-
return_code=$?
1004-
set -e
1005-
1006-
# Fail when the accuracy tests fail:
1007-
exit $return_code

.evergreen/generative-ai-accuracy-test-empty.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.evergreen/generative-ai-accuracy-test.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)