Skip to content

Commit 04c3453

Browse files
gribnoysupgribnoysup
committed
Merge remote-tracking branch 'origin/main' into 1.33-releases
2 parents 4e9b57e + 4b7d5c3 commit 04c3453

File tree

154 files changed

+3677
-1697
lines changed

Some content is hidden

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

154 files changed

+3677
-1697
lines changed

‎.evergreen/buildvariants.in.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
buildvariants:
2-
- name: macos_gui
3-
display_name: MacOS x64 (Test w/ GUI Session)
4-
run_on: macos-1100-gui
5-
tasks:
6-
- name: test-electron
7-
# TODO: Even though these tests are running, they run compass with a
8-
# keychain disabled and clipboard tests skipped
9-
#
10-
# https://jira.mongodb.org/browse/BUILD-14458
11-
# https://jira.mongodb.org/browse/BUILD-14780
12-
- name: test-packaged-app-macos
13-
14-
- name: macos
15-
display_name: MacOS x64 (Test and Package)
16-
run_on: macos-1100-gui
17-
tasks:
18-
- name: test
19-
- name: check
20-
- name: package
21-
- name: package-readonly
22-
- name: package-isolated
23-
24-
- name: macos_arm
25-
display_name: MacOS arm64 (Package)
26-
run_on: macos-1100-arm64
27-
tasks:
28-
- name: package
29-
- name: package-readonly
30-
- name: package-isolated
31-
322
- name: coverage
333
display_name: E2E Coverage
344
run_on: ubuntu1604-large

‎.evergreen/buildvariants.yml‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
buildvariants:
2-
- name: macos_gui
3-
display_name: MacOS x64 (Test w/ GUI Session)
4-
run_on: macos-1100-gui
5-
tasks:
6-
- name: test-electron
7-
# TODO: Even though these tests are running, they run compass with a
8-
# keychain disabled and clipboard tests skipped
9-
#
10-
# https://jira.mongodb.org/browse/BUILD-14458
11-
# https://jira.mongodb.org/browse/BUILD-14780
12-
- name: test-packaged-app-macos
13-
14-
- name: macos
15-
display_name: MacOS x64 (Test and Package)
16-
run_on: macos-1100-gui
17-
tasks:
18-
- name: test
19-
- name: check
20-
- name: package
21-
- name: package-readonly
22-
- name: package-isolated
23-
24-
- name: macos_arm
25-
display_name: MacOS arm64 (Package)
26-
run_on: macos-1100-arm64
27-
tasks:
28-
- name: package
29-
- name: package-readonly
30-
- name: package-isolated
31-
322
- name: coverage
333
display_name: E2E Coverage
344
run_on: ubuntu1604-large
@@ -109,3 +79,27 @@ buildvariants:
10979
- name: test-packaged-app-5x-community
11080
- name: test-packaged-app-5x-enterprise
11181
- name: test-packaged-app-60x-enterprise
82+
83+
- name: macos
84+
display_name: MacOS x64 (Test and Package)
85+
run_on: macos-1100-gui
86+
tasks:
87+
- name: test
88+
- name: test-electron
89+
- name: check
90+
- name: package
91+
- name: package-readonly
92+
- name: package-isolated
93+
- name: test-packaged-app-60x-enterprise
94+
95+
- name: macos_arm64
96+
display_name: MacOS arm64 (Test and Package)
97+
run_on: macos-1100-arm64-gui
98+
tasks:
99+
- name: test
100+
- name: test-electron
101+
- name: check
102+
- name: package
103+
- name: package-readonly
104+
- name: package-isolated
105+
- name: test-packaged-app-60x-enterprise

‎.evergreen/functions.yml‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variables:
3434
EVERGREEN_TASK_URL: https://evergreen.mongodb.com/task/${task_id}
3535
EVERGREEN_VERSION_ID: ${version_id}
3636
EVERGREEN_WORKDIR: ${workdir}
37-
NODE_JS_VERSION: '16.15.1'
37+
NODE_JS_VERSION: '16.17.0'
3838
NPM_VERSION: '8.15.1'
3939
# secrets
4040
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
@@ -189,6 +189,9 @@ functions:
189189
shell: bash
190190
env:
191191
<<: *compass-env
192+
DEBUG: ${debug|}
193+
MONGODB_VERSION: ${mongodb_version|}
194+
MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
192195
script: |
193196
set -e
194197
@@ -201,13 +204,7 @@ functions:
201204
# separately in the test-packaged-app task
202205
export IGNORE_TESTS="compass-e2e-tests"
203206
204-
# debug option is not very useful in normal runs, but helpful when
205-
# debugging any issues with tests. Set to "mocha*", "hadron*", or
206-
# "mongo*" for some helpful output from the test tooling we are using
207-
DEBUG=${debug} \
208-
MONGODB_VERSION="${mongodb_version|4.4.x}" \
209-
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
210-
npm run --unsafe-perm test-ci -- --stream --ignore="$IGNORE_TESTS"
207+
npm run --unsafe-perm test-ci -- --stream --ignore="$IGNORE_TESTS"
211208
212209
test-electron:
213210
- command: shell.exec
@@ -218,6 +215,9 @@ functions:
218215
shell: bash
219216
env:
220217
<<: *compass-env
218+
DEBUG: ${debug|}
219+
MONGODB_VERSION: ${mongodb_version|}
220+
MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
221221
script: |
222222
set -e
223223
@@ -229,10 +229,7 @@ functions:
229229
# Preparing native addons for electron runtime
230230
npm run --unsafe-perm electron-rebuild
231231
232-
DEBUG=${debug} \
233-
MONGODB_VERSION="${mongodb_version|4.4.x}" \
234-
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
235-
npm run --unsafe-perm test-ci-electron -- --stream
232+
npm run --unsafe-perm test-ci-electron -- --stream
236233
237234
apply-compass-target-expansion:
238235
- command: shell.exec
@@ -341,6 +338,9 @@ functions:
341338
shell: bash
342339
env:
343340
<<: *compass-env
341+
DEBUG: ${debug|}
342+
MONGODB_VERSION: ${mongodb_version|}
343+
MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
344344
script: |
345345
set -e
346346
# Load environment variables
@@ -349,10 +349,7 @@ functions:
349349
350350
echo "Running E2E tests while collecting coverage..."
351351
352-
DEBUG=${debug} \
353-
MONGODB_VERSION="${mongodb_version|4.4.x}" \
354-
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
355-
npm run --unsafe-perm --workspace compass-e2e-tests test-ci
352+
npm run --unsafe-perm --workspace compass-e2e-tests test-ci
356353
357354
test-packaged-app:
358355
- command: shell.exec
@@ -365,6 +362,9 @@ functions:
365362
<<: *compass-env
366363
COMPASS_APP_PATH: ${appPath}
367364
COMPASS_APP_NAME: ${packagerOptions.name}
365+
DEBUG: ${debug|}
366+
MONGODB_VERSION: ${mongodb_version|}
367+
MONGODB_USE_ENTERPRISE: ${mongodb_use_enterprise|}
368368
script: |
369369
set -e
370370
# Load environment variables
@@ -380,10 +380,7 @@ functions:
380380
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
381381
fi
382382
383-
DEBUG=${debug} \
384-
MONGODB_VERSION="${mongodb_version|4.4.x}" \
385-
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
386-
npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci
383+
npm run --unsafe-perm --workspace compass-e2e-tests test-packaged-ci
387384
388385
test-connectivity:
389386
- command: shell.exec

‎.evergreen/preinstall.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ echo "========================="
66
echo "Important Environment Variables"
77
echo "========================="
88
echo "PLATFORM: $PLATFORM"
9+
echo "ARCH: $ARCH"
910
echo "NODE_JS_VERSION: $NODE_JS_VERSION"
1011
echo "NPM_VERSION: $NPM_VERSION"
1112
echo "APPDATA: $APPDATA"
1213
echo "PATH: $PATH"
1314

14-
echo "PLATFORM: $PLATFORM"
1515
echo "IS_OSX: $IS_OSX"
1616
echo "IS_LINUX: $IS_LINUX"
1717
echo "IS_WINDOWS: $IS_WINDOWS"
@@ -23,13 +23,13 @@ SCRIPTDIR="$(cd $(dirname "$0"); pwd)"
2323
if [ -n "$IS_WINDOWS" ]; then
2424
echo "Installing nodejs v$NODE_JS_VERSION for windows..."
2525
bash "${SCRIPTDIR}/retry-with-backoff.sh" curl -fs \
26-
-o ".deps/node-v$NODE_JS_VERSION-win-x64.zip" \
27-
--url "https://nodejs.org/download/release/v$NODE_JS_VERSION/node-v$NODE_JS_VERSION-win-x64.zip"
26+
-o ".deps/node-v$NODE_JS_VERSION-win-$ARCH.zip" \
27+
--url "https://nodejs.org/download/release/v$NODE_JS_VERSION/node-v$NODE_JS_VERSION-win-$ARCH.zip"
2828
cd .deps
2929
ls -alh
30-
unzip -q node-v$NODE_JS_VERSION-win-x64.zip
31-
mv node-v$NODE_JS_VERSION-win-x64/* .
32-
rm -rf node-v$NODE_JS_VERSION-win-x64
30+
unzip -q node-v$NODE_JS_VERSION-win-$ARCH.zip
31+
mv node-v$NODE_JS_VERSION-win-$ARCH/* .
32+
rm -rf node-v$NODE_JS_VERSION-win-$ARCH
3333

3434
echo "Installing npm@$NPM_VERSION..."
3535
rm -rf npm npx npm.cmd npx.cmd
@@ -43,13 +43,13 @@ if [ -n "$IS_WINDOWS" ]; then
4343
cd ..
4444
.evergreen/node-gyp-bug-workaround.sh
4545
else
46-
echo "Installing nodejs v${NODE_JS_VERSION} for ${PLATFORM}..."
46+
echo "Installing nodejs v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
4747

4848
bash "${SCRIPTDIR}/retry-with-backoff.sh" curl -fs \
49-
-o ".deps/node-v${NODE_JS_VERSION}-${PLATFORM}-x64.tar.gz" \
50-
--url "https://nodejs.org/download/release/v${NODE_JS_VERSION}/node-v${NODE_JS_VERSION}-${PLATFORM}-x64.tar.gz"
49+
-o ".deps/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz" \
50+
--url "https://nodejs.org/download/release/v${NODE_JS_VERSION}/node-v${NODE_JS_VERSION}-${PLATFORM}-$ARCH.tar.gz"
5151
cd .deps
52-
tar xzf node-v$NODE_JS_VERSION-$PLATFORM-x64.tar.gz --strip-components=1
52+
tar xzf node-v$NODE_JS_VERSION-$PLATFORM-$ARCH.tar.gz --strip-components=1
5353

5454
echo "Installing latest npm..."
5555
rm -rf npm npx

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,19 @@ function printCompassEnv() {
9494
printVar('npm_config_cache', npmCacheDir);
9595
// npm tmp is deprecated, but let's keep it around just in case
9696
printVar('npm_config_tmp', npmTmpDir);
97+
// Also set in our .npmrc but that does not get picked up in the preinstall script.
98+
printVar('npm_config_registry', 'https://registry.npmjs.org/');
9799

98100
printVar('PLATFORM', process.env.PLATFORM);
101+
printVar('ARCH', process.env.ARCH);
99102
printVar('IS_WINDOWS', process.env.IS_WINDOWS);
100103
printVar('IS_OSX', process.env.IS_OSX);
101104
printVar('IS_LINUX', process.env.IS_LINUX);
102105
printVar('IS_RHEL', process.env.IS_RHEL);
103106
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
107+
printVar('DEBUG', process.env.DEBUG);
108+
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
109+
printVar('MONGODB_USE_ENTERPRISE', process.env.MONGODB_USE_ENTERPRISE);
104110
}
105111

106112
printCompassEnv();

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@
22

33
set -e
44

5+
export MONGODB_DEFAULT_VERSION=4.4.x
56
if [[ $OSTYPE == "cygwin" ]]; then
67
export PLATFORM='win32'
78
export IS_WINDOWS=true
9+
export ARCH=x64
810
elif [[ $(uname) == Darwin ]]; then
911
export PLATFORM='darwin'
1012
export IS_OSX=true
13+
if [ `uname -m` = x86_64 ]; then
14+
export ARCH=x64
15+
else
16+
export ARCH=arm64
17+
export MONGODB_DEFAULT_VERSION=6.x.x
18+
fi
1119
else
1220
export PLATFORM='linux'
1321
export IS_LINUX=true
22+
export ARCH=x64
1423
if [[ $(cat /etc/*release | grep ^NAME | grep Red) ]]; then
1524
export IS_RHEL=true
1625
elif [[ $(cat /etc/*release | grep ^NAME | grep Ubuntu) ]]; then

‎.evergreen/start-docker-envs.sh‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ elif ! command -v docker-compose &>/dev/null; then
99
else
1010
echo "Starting test environments"
1111

12+
DOCKER_COMPOSE="env MONGODB_VERSION= docker-compose"
13+
1214
git clone -b v1.2.4 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
13-
docker-compose -f test-envs/docker/enterprise/docker-compose.yaml up -d
14-
docker-compose -f test-envs/docker/ldap/docker-compose.yaml up -d
15-
docker-compose -f test-envs/docker/scram/docker-compose.yaml up -d
16-
docker-compose -f test-envs/docker/sharded/docker-compose.yaml up -d
17-
docker-compose -f test-envs/docker/ssh/docker-compose.yaml up -d
18-
docker-compose -f test-envs/docker/tls/docker-compose.yaml up -d
19-
docker-compose -f test-envs/docker/kerberos/docker-compose.yaml up -d
15+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
16+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
17+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d
18+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml up -d
19+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml up -d
20+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml up -d
21+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml up -d
2022

2123
__stop_all_docker_containers() {
2224
echo "Stopping test environments"
23-
docker-compose -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
24-
docker-compose -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
25-
docker-compose -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
26-
docker-compose -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
27-
docker-compose -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
28-
docker-compose -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
29-
docker-compose -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
25+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
26+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
27+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
28+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
29+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
30+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
31+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
3032
}
3133

3234
trap "__stop_all_docker_containers" EXIT

‎.evergreen/tasks.in.yml‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ tasks:
5353
- func: save-macos-artifacts
5454
vars:
5555
compass_distribution: compass
56-
variants: [macos_arm]
56+
variants: [macos_arm64]
5757
- func: save-rhel-artifacts
5858
vars:
5959
compass_distribution: compass
@@ -89,7 +89,7 @@ tasks:
8989
- func: save-macos-artifacts
9090
vars:
9191
compass_distribution: compass-isolated
92-
variants: [macos_arm]
92+
variants: [macos_arm64]
9393
- func: save-rhel-artifacts
9494
vars:
9595
compass_distribution: compass-isolated
@@ -125,7 +125,7 @@ tasks:
125125
- func: save-macos-artifacts
126126
vars:
127127
compass_distribution: compass-readonly
128-
variants: [macos_arm]
128+
variants: [macos_arm64]
129129
- func: save-rhel-artifacts
130130
vars:
131131
compass_distribution: compass-readonly
@@ -163,30 +163,6 @@ tasks:
163163
vars:
164164
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
165165

166-
# same as test-packaged-app except for depends_on
167-
- name: test-packaged-app-macos
168-
tags: ['required-for-publish', 'run-on-pr']
169-
depends_on:
170-
- name: package
171-
variant: macos
172-
commands:
173-
- func: prepare
174-
- func: install
175-
- func: bootstrap
176-
vars:
177-
scope: 'compass-e2e-tests'
178-
- func: apply-compass-target-expansion
179-
vars:
180-
compass_distribution: compass
181-
- func: get-packaged-app
182-
vars:
183-
compass_distribution: compass
184-
- func: test-packaged-app
185-
vars:
186-
mongodb_version: '5.x.x'
187-
compass_distribution: compass
188-
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
189-
190166
# Publish happens in one go to make sure we are not creating multiple github
191167
# releases in parallel
192168
- name: publish

0 commit comments

Comments
 (0)