Skip to content

Commit 73a8db3

Browse files
AnemyAnemy
committed
merge main
2 parents d5c9b51 + ff66d30 commit 73a8db3

File tree

146 files changed

+7536
-49857
lines changed

Some content is hidden

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

146 files changed

+7536
-49857
lines changed

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ const PACKAGE_BUILD_VARIANTS = [
6161
];
6262
6363
const SMOKETEST_BUILD_VARIANTS = [
64-
// {
65-
// name: 'smoketest-ubuntu',
66-
// display_name: 'Smoketest Ubuntu',
67-
// run_on: 'ubuntu2004-large',
68-
// depends_on: 'package-ubuntu',
69-
// },
64+
{
65+
name: 'smoketest-ubuntu',
66+
display_name: 'Smoketest Ubuntu',
67+
run_on: 'ubuntu2004-large',
68+
depends_on: 'package-ubuntu',
69+
},
7070
{
7171
name: 'smoketest-windows',
7272
display_name: 'Smoketest Windows',
@@ -160,6 +160,9 @@ const MAINTAINED_SERVER_VERSIONS = [
160160
{ name: '80x-enterprise', version: '8.0.x-enterprise' },
161161
];
162162
163+
const LATEST_MAINTAINED_SERVER_VERSION =
164+
MAINTAINED_SERVER_VERSIONS[MAINTAINED_SERVER_VERSIONS.length - 1];
165+
163166
const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };
164167
165168
const SERVER_VERSIONS = [
@@ -222,7 +225,7 @@ buildvariants:
222225
- name: package-<%= distribution %>
223226
variant: <%= buildVariant.depends_on %>
224227
tasks:
225-
- name: smoketest-<%= distribution %>
228+
- name: smoketest-<%= distribution %>
226229
<% } %>
227230
<% } %>
228231

@@ -357,6 +360,7 @@ tasks:
357360
- func: test
358361
vars:
359362
debug: 'hadron*,mongo*'
363+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
360364

361365
- name: test-electron
362366
tags: ['required-for-publish', 'run-on-pr']
@@ -367,6 +371,7 @@ tasks:
367371
- func: test-electron
368372
vars:
369373
debug: 'hadron*,mongo*'
374+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
370375

371376
- name: test-connectivity
372377
tags: ['required-for-publish', 'run-on-pr']
@@ -375,6 +380,7 @@ tasks:
375380
- func: test-connectivity
376381
vars:
377382
debug: 'compass*,electron*,hadron*,mongo*'
383+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
378384

379385
- name: test-csfle
380386
tags: ['required-for-publish', 'run-on-pr']
@@ -385,6 +391,7 @@ tasks:
385391
- func: test-csfle
386392
vars:
387393
debug: 'compass*,electron*,hadron*,mongo*'
394+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
388395

389396
<% for(const group of E2E_TEST_GROUPS) { %>
390397
- name: e2e-coverage-<%= group.number %>
@@ -398,6 +405,7 @@ tasks:
398405
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
399406
e2e_test_group: <%= group.number %>
400407
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
408+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
401409
<% } %>
402410

403411
- name: generate-vulnerability-report
@@ -471,7 +479,7 @@ tasks:
471479
scope: 'compass-e2e-tests'
472480
- func: smoketest-packaged-app
473481
vars:
474-
mongodb_version: latest-enterprise
482+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
475483
compass_distribution: <%= distribution %>
476484
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
477485
<% } %>
@@ -525,7 +533,7 @@ tasks:
525533
compass_distribution: compass
526534
- func: test-packaged-app
527535
vars:
528-
mongodb_version: latest-enterprise
536+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
529537
compass_distribution: compass
530538
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
531539
e2e_test_group: <%= group.number %>
@@ -551,7 +559,7 @@ tasks:
551559
compass_distribution: compass
552560
- func: test-web-sandbox
553561
vars:
554-
mongodb_version: latest-enterprise
562+
mongodb_version: <%= LATEST_MAINTAINED_SERVER_VERSION.version %>
555563
browser_name: '<%= browser %>'
556564
compass_distribution: compass
557565
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>

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

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ buildvariants:
7676
- name: package-compass
7777
- name: package-compass-isolated
7878
- name: package-compass-readonly
79+
- name: smoketest-ubuntu-compass
80+
display_name: Smoketest Ubuntu (compass)
81+
run_on: ubuntu2004-large
82+
depends_on:
83+
- name: package-compass
84+
variant: package-ubuntu
85+
tasks:
86+
- name: smoketest-compass
7987
- name: smoketest-windows-compass
8088
display_name: Smoketest Windows (compass)
8189
run_on: windows-vsCurrent-large
@@ -313,6 +321,7 @@ tasks:
313321
- func: test
314322
vars:
315323
debug: hadron*,mongo*
324+
mongodb_version: 8.0.x-enterprise
316325
- name: test-electron
317326
tags:
318327
- required-for-publish
@@ -324,6 +333,7 @@ tasks:
324333
- func: test-electron
325334
vars:
326335
debug: hadron*,mongo*
336+
mongodb_version: 8.0.x-enterprise
327337
- name: test-connectivity
328338
tags:
329339
- required-for-publish
@@ -333,6 +343,7 @@ tasks:
333343
- func: test-connectivity
334344
vars:
335345
debug: compass*,electron*,hadron*,mongo*
346+
mongodb_version: 8.0.x-enterprise
336347
- name: test-csfle
337348
tags:
338349
- required-for-publish
@@ -344,6 +355,7 @@ tasks:
344355
- func: test-csfle
345356
vars:
346357
debug: compass*,electron*,hadron*,mongo*
358+
mongodb_version: 8.0.x-enterprise
347359
- name: e2e-coverage-1
348360
tags:
349361
- required-for-publish
@@ -357,6 +369,7 @@ tasks:
357369
e2e_test_groups: 3
358370
e2e_test_group: 1
359371
debug: compass-e2e-tests*,electron*,hadron*,mongo*
372+
mongodb_version: 8.0.x-enterprise
360373
- name: e2e-coverage-2
361374
tags:
362375
- required-for-publish
@@ -370,6 +383,7 @@ tasks:
370383
e2e_test_groups: 3
371384
e2e_test_group: 2
372385
debug: compass-e2e-tests*,electron*,hadron*,mongo*
386+
mongodb_version: 8.0.x-enterprise
373387
- name: e2e-coverage-3
374388
tags:
375389
- required-for-publish
@@ -383,6 +397,7 @@ tasks:
383397
e2e_test_groups: 3
384398
e2e_test_group: 3
385399
debug: compass-e2e-tests*,electron*,hadron*,mongo*
400+
mongodb_version: 8.0.x-enterprise
386401
- name: generate-vulnerability-report
387402
tags:
388403
- required-for-publish
@@ -497,7 +512,7 @@ tasks:
497512
scope: compass-e2e-tests
498513
- func: smoketest-packaged-app
499514
vars:
500-
mongodb_version: latest-enterprise
515+
mongodb_version: 8.0.x-enterprise
501516
compass_distribution: compass
502517
debug: compass-e2e-tests*,electron*,hadron*,mongo*
503518
- name: test-server-40x-community-1
@@ -1555,7 +1570,7 @@ tasks:
15551570
compass_distribution: compass
15561571
- func: test-packaged-app
15571572
vars:
1558-
mongodb_version: latest-enterprise
1573+
mongodb_version: 8.0.x-enterprise
15591574
compass_distribution: compass
15601575
e2e_test_groups: 3
15611576
e2e_test_group: 1
@@ -1580,7 +1595,7 @@ tasks:
15801595
compass_distribution: compass
15811596
- func: test-packaged-app
15821597
vars:
1583-
mongodb_version: latest-enterprise
1598+
mongodb_version: 8.0.x-enterprise
15841599
compass_distribution: compass
15851600
e2e_test_groups: 3
15861601
e2e_test_group: 2
@@ -1605,7 +1620,7 @@ tasks:
16051620
compass_distribution: compass
16061621
- func: test-packaged-app
16071622
vars:
1608-
mongodb_version: latest-enterprise
1623+
mongodb_version: 8.0.x-enterprise
16091624
compass_distribution: compass
16101625
e2e_test_groups: 3
16111626
e2e_test_group: 3
@@ -1627,7 +1642,7 @@ tasks:
16271642
compass_distribution: compass
16281643
- func: test-web-sandbox
16291644
vars:
1630-
mongodb_version: latest-enterprise
1645+
mongodb_version: 8.0.x-enterprise
16311646
browser_name: chrome
16321647
compass_distribution: compass
16331648
e2e_test_groups: 3
@@ -1650,7 +1665,7 @@ tasks:
16501665
compass_distribution: compass
16511666
- func: test-web-sandbox
16521667
vars:
1653-
mongodb_version: latest-enterprise
1668+
mongodb_version: 8.0.x-enterprise
16541669
browser_name: chrome
16551670
compass_distribution: compass
16561671
e2e_test_groups: 3
@@ -1673,7 +1688,7 @@ tasks:
16731688
compass_distribution: compass
16741689
- func: test-web-sandbox
16751690
vars:
1676-
mongodb_version: latest-enterprise
1691+
mongodb_version: 8.0.x-enterprise
16771692
browser_name: chrome
16781693
compass_distribution: compass
16791694
e2e_test_groups: 3
@@ -1696,7 +1711,7 @@ tasks:
16961711
compass_distribution: compass
16971712
- func: test-web-sandbox
16981713
vars:
1699-
mongodb_version: latest-enterprise
1714+
mongodb_version: 8.0.x-enterprise
17001715
browser_name: firefox
17011716
compass_distribution: compass
17021717
e2e_test_groups: 3
@@ -1719,7 +1734,7 @@ tasks:
17191734
compass_distribution: compass
17201735
- func: test-web-sandbox
17211736
vars:
1722-
mongodb_version: latest-enterprise
1737+
mongodb_version: 8.0.x-enterprise
17231738
browser_name: firefox
17241739
compass_distribution: compass
17251740
e2e_test_groups: 3
@@ -1742,7 +1757,7 @@ tasks:
17421757
compass_distribution: compass
17431758
- func: test-web-sandbox
17441759
vars:
1745-
mongodb_version: latest-enterprise
1760+
mongodb_version: 8.0.x-enterprise
17461761
browser_name: firefox
17471762
compass_distribution: compass
17481763
e2e_test_groups: 3

‎.evergreen/functions.yml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,13 @@ functions:
649649
npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci
650650
651651
smoketest-packaged-app:
652+
- command: github.generate_token
653+
params:
654+
owner: 10gen
655+
repo: compass-mongodb-com
656+
expansion_name: generated_token
657+
permissions: # optional
658+
contents: read
652659
- command: shell.exec
653660
# Fail the task if it's idle for 10 mins
654661
timeout_secs: 600
@@ -667,27 +674,33 @@ functions:
667674
# Load environment variables
668675
eval $(.evergreen/print-compass-env.sh)
669676
677+
npm i -w packages/compass-smoke-tests https://x-access-token:${generated_token}@github.com/10gen/compass-mongodb-com --engine-strict=false
678+
670679
if [[ "$IS_WINDOWS" == "true" ]]; then
671-
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip
672-
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_msi
680+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_setup --tests time-to-first-query
681+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip --tests auto-update-from
682+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_msi --tests auto-update-from
673683
fi
674684
675685
if [[ "$IS_OSX" == "true" ]]; then
676686
echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
677687
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
678-
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_dmg
679-
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_zip
688+
# NOTE: We're also skipping auto-update of the macOS app in CI
689+
# because it doesn't work. Running a different test to make sure it
690+
# can install and run successfully at least.
691+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_zip --tests=time-to-first-query
692+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_dmg --tests=time-to-first-query
680693
fi
681694
682-
#if [[ "$IS_UBUNTU" == "true" ]]; then
683-
# TODO: linux_deb
684-
# TODO: linux_tar
685-
#fi
695+
if [[ "$IS_UBUNTU" == "true" ]]; then
696+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=linux_deb --tests=time-to-first-query
697+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=linux_tar --tests=time-to-first-query
698+
fi
686699
687-
#if [[ "$IS_RHEL" == "true" ]]; then
700+
if [[ "$IS_RHEL" == "true" ]]; then
688701
# TODO: linux_rpm
689-
# TODO: rhel_tar
690-
#fi
702+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=linux_tar --tests=time-to-first-query
703+
fi
691704
692705
test-web-sandbox:
693706
- command: shell.exec

‎.evergreen/preinstall.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ echo "APPDATA: $APPDATA"
1313
echo "PATH: $PATH"
1414

1515
# these are super useful if you want to run the smoke tests locally
16-
echo "DEV_VERSION_IDENTIFIER: $DEV_VERSION_IDENTIFIER"
17-
echo "EVERGREEN_BUCKET_NAME: $EVERGREEN_BUCKET_NAME"
18-
echo "EVERGREEN_BUCKET_KEY_PREFIX: $EVERGREEN_BUCKET_KEY_PREFIX"
16+
echo "export DEV_VERSION_IDENTIFIER=$DEV_VERSION_IDENTIFIER"
17+
echo "export EVERGREEN_BUCKET_KEY_PREFIX=$EVERGREEN_BUCKET_KEY_PREFIX"
18+
echo "export EVERGREEN_BUCKET_NAME=$EVERGREEN_BUCKET_NAME"
1919

2020
echo "IS_OSX: $IS_OSX"
2121
echo "IS_LINUX: $IS_LINUX"

‎.evergreen/print-compass-env.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ function printCompassEnv() {
101101
printVar('IS_RHEL', process.env.IS_RHEL);
102102
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
103103
printVar('DEBUG', process.env.DEBUG);
104-
printVar(
105-
'MONGODB_VERSION',
106-
process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
107-
);
104+
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION);
108105
printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
109106
printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
110107
printVar(

‎.evergreen/print-compass-env.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
set -e
44

5-
export MONGODB_DEFAULT_VERSION=7.0.x
6-
75
if [[ $OSTYPE == "cygwin" ]]; then
86
export PLATFORM='win32'
97
export IS_WINDOWS=true

‎.github/workflows/test-installers.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Test Installers
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
workflow_dispatch:
8+
inputs:
9+
bucket_name:
10+
type: string
11+
description: 'S3 bucket to download installers from'
12+
required: true
13+
bucket_key_prefix:
14+
type: string
15+
description: 'S3 bucket key prefix to download installers from'
16+
required: true
17+
version:
18+
type: string
19+
description: 'Version of the installer to download'
20+
required: true
21+
22+
jobs:
23+
test:
24+
name: Dummy action
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v2
29+
- name: Setup Node.js
30+
uses: actions/setup-node@v4
31+
with:
32+
node-version: 20
33+
cache: "npm"
34+
- name: Install dependencies
35+
run: npm ci
36+

0 commit comments

Comments
 (0)