Skip to content

Commit c736e32

Browse files
gagikgagik
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/individual-publishing
2 parents e2ceaa5 + 7b85237 commit c736e32

File tree

7 files changed

+39
-30
lines changed

7 files changed

+39
-30
lines changed

‎.evergreen.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4272,6 +4272,7 @@ functions:
42724272
{
42734273
export NODE_JS_VERSION=${node_js_version}
42744274
source .evergreen/setup-env.sh
4275+
export PUPPETEER_SKIP_DOWNLOAD="true"
42754276
npm run evergreen-release draft
42764277
}
42774278
@@ -4289,6 +4290,7 @@ functions:
42894290
node_js_version: ${node_js_version}
42904291
script: |
42914292
set -e
4293+
export PUPPETEER_SKIP_DOWNLOAD="true"
42924294
.evergreen/run-evergreen-release.sh download-and-list-artifacts
42934295
- command: shell.exec
42944296
params:
@@ -4317,6 +4319,7 @@ functions:
43174319
node_js_version: ${node_js_version}
43184320
script: |
43194321
set -e
4322+
export PUPPETEER_SKIP_DOWNLOAD="true"
43204323
.evergreen/run-evergreen-release.sh publish -- --dry-run
43214324
43224325
release_publish:
@@ -4335,6 +4338,7 @@ functions:
43354338
node_js_version: ${node_js_version}
43364339
script: |
43374340
set -e
4341+
export PUPPETEER_SKIP_DOWNLOAD="true"
43384342
.evergreen/run-evergreen-release.sh publish
43394343
43404344
run_perf_tests:
@@ -5436,7 +5440,7 @@ tasks:
54365440
node_js_version: ${node_js_version}
54375441
mongosh_server_test_version: ${mongosh_server_test_version}
54385442
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5439-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5443+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
54405444
- name: e2e_tests_linux_x64_rhel8
54415445
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
54425446
depends_on:
@@ -5455,7 +5459,7 @@ tasks:
54555459
node_js_version: ${node_js_version}
54565460
mongosh_server_test_version: ${mongosh_server_test_version}
54575461
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5458-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5462+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
54595463
- name: e2e_tests_linux_x64_openssl11
54605464
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
54615465
depends_on:
@@ -5474,7 +5478,7 @@ tasks:
54745478
node_js_version: ${node_js_version}
54755479
mongosh_server_test_version: ${mongosh_server_test_version}
54765480
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5477-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5481+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
54785482
- name: e2e_tests_linux_x64_openssl11_rhel8
54795483
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
54805484
depends_on:
@@ -5493,7 +5497,7 @@ tasks:
54935497
node_js_version: ${node_js_version}
54945498
mongosh_server_test_version: ${mongosh_server_test_version}
54955499
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5496-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5500+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
54975501
- name: e2e_tests_linux_x64_openssl3
54985502
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
54995503
depends_on:
@@ -5512,7 +5516,7 @@ tasks:
55125516
node_js_version: ${node_js_version}
55135517
mongosh_server_test_version: ${mongosh_server_test_version}
55145518
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5515-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5519+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
55165520
- name: e2e_tests_linux_x64_openssl3_rhel8
55175521
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
55185522
depends_on:
@@ -5531,7 +5535,7 @@ tasks:
55315535
node_js_version: ${node_js_version}
55325536
mongosh_server_test_version: ${mongosh_server_test_version}
55335537
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5534-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5538+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
55355539
- name: e2e_tests_linux_arm64
55365540
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
55375541
depends_on:
@@ -5550,7 +5554,7 @@ tasks:
55505554
node_js_version: ${node_js_version}
55515555
mongosh_server_test_version: ${mongosh_server_test_version}
55525556
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5553-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5557+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
55545558
- name: e2e_tests_linux_arm64_openssl11
55555559
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
55565560
depends_on:
@@ -5569,7 +5573,7 @@ tasks:
55695573
node_js_version: ${node_js_version}
55705574
mongosh_server_test_version: ${mongosh_server_test_version}
55715575
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5572-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5576+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
55735577
- name: e2e_tests_linux_arm64_openssl3
55745578
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
55755579
depends_on:
@@ -5588,7 +5592,7 @@ tasks:
55885592
node_js_version: ${node_js_version}
55895593
mongosh_server_test_version: ${mongosh_server_test_version}
55905594
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5591-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5595+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
55925596
- name: e2e_tests_linux_ppc64le
55935597
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
55945598
depends_on:
@@ -5607,7 +5611,7 @@ tasks:
56075611
node_js_version: ${node_js_version}
56085612
mongosh_server_test_version: ${mongosh_server_test_version}
56095613
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5610-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5614+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
56115615
- name: e2e_tests_linux_s390x
56125616
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
56135617
depends_on:
@@ -5626,7 +5630,7 @@ tasks:
56265630
node_js_version: ${node_js_version}
56275631
mongosh_server_test_version: ${mongosh_server_test_version}
56285632
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5629-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5633+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
56305634
- name: e2e_tests_darwin
56315635
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
56325636
depends_on:
@@ -5645,7 +5649,7 @@ tasks:
56455649
node_js_version: ${node_js_version}
56465650
mongosh_server_test_version: ${mongosh_server_test_version}
56475651
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5648-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5652+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
56495653
- name: e2e_tests_darwin_arm64
56505654
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
56515655
depends_on:
@@ -5664,7 +5668,7 @@ tasks:
56645668
node_js_version: ${node_js_version}
56655669
mongosh_server_test_version: ${mongosh_server_test_version}
56665670
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5667-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5671+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
56685672
- name: e2e_tests_win32
56695673
tags: ["e2e-test", "assigned_to_jira_team_mongosh_mongosh"]
56705674
depends_on:
@@ -5683,8 +5687,8 @@ tasks:
56835687
node_js_version: ${node_js_version}
56845688
mongosh_server_test_version: ${mongosh_server_test_version}
56855689
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
5686-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5687-
- name: perf_tests
5690+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
5691+
- name: perf_tests_linux_x64
56885692
tags: ["perf-test"]
56895693
depends_on:
56905694
- name: compile_artifact
@@ -5698,7 +5702,7 @@ tasks:
56985702
vars:
56995703
executable_os_id: "linux-x64"
57005704
- func: run_perf_tests
5701-
5705+
57025706
###
57035707
# EXECUTABLE CONNECTIVITY TESTS
57045708
###
@@ -11803,8 +11807,8 @@ buildvariants:
1180311807
tasks:
1180411808
- name: generate_license_and_vulnerability_report
1180511809

11806-
- name: perf_tests
11807-
display_name: "Performance Tests"
11810+
- name: perf_tests_linux_x64
11811+
display_name: "Performance Tests (x64 Linux)"
1180811812
run_on: rhel90-dbx-perf-large
1180911813
tasks:
11810-
- name: perf_tests
11814+
- name: perf_tests_linux_x64

‎.evergreen/compile-artifact.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7474
export LD_LIBRARY_PATH=/tmp/m/opt/lib
7575
fi
7676

77+
export PUPPETEER_SKIP_DOWNLOAD="true"
7778
npm run evergreen-release compile
7879
dist/mongosh --version
7980
dist/mongosh --build-info

‎.evergreen/evergreen.yml.in

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,7 @@ functions:
917917
{
918918
export NODE_JS_VERSION=${node_js_version}
919919
source .evergreen/setup-env.sh
920+
export PUPPETEER_SKIP_DOWNLOAD="true"
920921
npm run evergreen-release draft
921922
git add .
922923
git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -936,6 +937,7 @@ functions:
936937
node_js_version: ${node_js_version}
937938
script: |
938939
set -e
940+
export PUPPETEER_SKIP_DOWNLOAD="true"
939941
.evergreen/run-evergreen-release.sh download-and-list-artifacts
940942
- command: shell.exec
941943
params:
@@ -964,6 +966,7 @@ functions:
964966
node_js_version: ${node_js_version}
965967
script: |
966968
set -e
969+
export PUPPETEER_SKIP_DOWNLOAD="true"
967970
.evergreen/run-evergreen-release.sh publish -- --dry-run
968971

969972
release_publish:
@@ -982,6 +985,7 @@ functions:
982985
node_js_version: ${node_js_version}
983986
script: |
984987
set -e
988+
export PUPPETEER_SKIP_DOWNLOAD="true"
985989
.evergreen/run-evergreen-release.sh publish
986990

987991
run_perf_tests:
@@ -1166,7 +1170,7 @@ tasks:
11661170
# E2E TESTS
11671171
###
11681172
# Tests reuse the same compilation build variant, so we create those variations based on this.
1169-
<% for (const compileBuildVariant of COMPILE_BUILD_VARIANTS) {
1173+
<% for (const compileBuildVariant of COMPILE_BUILD_VARIANTS) {
11701174
const platformName = compileBuildVariant.name.replace('build_', '');
11711175
const executableOsId = platformName == 'darwin' ? 'darwin-x64' : platformName.replaceAll('_', '-');
11721176
%>
@@ -1188,9 +1192,9 @@ tasks:
11881192
node_js_version: ${node_js_version}
11891193
mongosh_server_test_version: ${mongosh_server_test_version}
11901194
mongosh_test_e2e_force_fips: ${mongosh_test_e2e_force_fips}
1191-
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
1195+
disable_openssl_shared_config_for_bundled_openssl: ${disable_openssl_shared_config_for_bundled_openssl|false}
11921196
<% } %>
1193-
- name: perf_tests
1197+
- name: perf_tests_linux_x64
11941198
tags: ["perf-test"]
11951199
depends_on:
11961200
- name: compile_artifact
@@ -1204,7 +1208,7 @@ tasks:
12041208
vars:
12051209
executable_os_id: "linux-x64"
12061210
- func: run_perf_tests
1207-
1211+
12081212
###
12091213
# EXECUTABLE CONNECTIVITY TESTS
12101214
###
@@ -1502,7 +1506,7 @@ buildvariants:
15021506
mongosh_server_test_version: "<% out(variant.mVersion) %>-enterprise"
15031507
mongosh_test_e2e_force_fips: "<% out(variant.fips ? '1' : '') %>"
15041508
tasks:
1505-
<%
1509+
<%
15061510
let tasks = [`e2e_tests_${variant.compileBuildVariant.replace('build_', '')}`, ...(variant.additionalTasks ?? [])];
15071511
for (const task of tasks) { %>
15081512
- name: <% out(task) %>
@@ -1685,8 +1689,8 @@ buildvariants:
16851689
tasks:
16861690
- name: generate_license_and_vulnerability_report
16871691

1688-
- name: perf_tests
1689-
display_name: "Performance Tests"
1692+
- name: perf_tests_linux_x64
1693+
display_name: "Performance Tests (x64 Linux)"
16901694
run_on: rhel90-dbx-perf-large
16911695
tasks:
1692-
- name: perf_tests
1696+
- name: perf_tests_linux_x64

‎.evergreen/package-and-upload-artifact.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
1313
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
1414
(cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
1515
echo Starting Docker container packaging
16-
docker run -e PUPPETEER_SKIP_DOWNLOAD=1 \
16+
docker run -e PUPPETEER_SKIP_DOWNLOAD \
1717
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
1818
-e NODE_JS_VERSION \
1919
-e PACKAGE_VARIANT \

‎.evergreen/run-evergreen-release.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
55
set -x
66
export NODE_JS_VERSION=${node_js_version}
77
source .evergreen/setup-env.sh
8+
export PUPPETEER_SKIP_DOWNLOAD="true"
89
npm run evergreen-release $@

‎.evergreen/setup-env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
1616
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
1717
export IS_MONGOSH_EVERGREEN_CI=1
1818
export DEBUG="mongodb*,$DEBUG"
19-
export PUPPETEER_SKIP_DOWNLOAD="true"
2019

2120
if [ "$OS" != "Windows_NT" ]; then
2221
if which realpath; then # No realpath on macOS, but also not needed there

‎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 **mongosh**.
2-
This document was automatically generated on Sun Dec 29 2024.
2+
This document was automatically generated on Wed Jan 08 2025.
33

44
## List of dependencies
55

0 commit comments

Comments
 (0)