Skip to content

Commit ccc966c

Browse files
gagikgagik
authored
chore(ci): skip chromium download for most tasks (#2432)
1 parent 030070c commit ccc966c

File tree

8 files changed

+41
-15
lines changed

8 files changed

+41
-15
lines changed

‎.evergreen.yml‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ functions:
121121
NODE_JS_VERSION: ${node_js_version}
122122
DISTRO_ID: ${distro_id}
123123
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
124+
PUPPETEER_SKIP_DOWNLOAD: "true"
124125
script: |
125126
set -e
126127
set -x
@@ -161,6 +162,7 @@ functions:
161162
NODE_JS_VERSION: ${node_js_version}
162163
DISTRO_ID: ${distro_id}
163164
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
165+
PUPPETEER_SKIP_DOWNLOAD: ${puppeteer_skip_download|true}
164166
script: |
165167
set -e
166168
set -x
@@ -4308,7 +4310,6 @@ functions:
43084310
{
43094311
export NODE_JS_VERSION=${node_js_version}
43104312
source .evergreen/setup-env.sh
4311-
export PUPPETEER_SKIP_DOWNLOAD="true"
43124313
npm run evergreen-release draft
43134314
git add .
43144315
git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -4328,7 +4329,6 @@ functions:
43284329
node_js_version: ${node_js_version}
43294330
script: |
43304331
set -e
4331-
export PUPPETEER_SKIP_DOWNLOAD="true"
43324332
.evergreen/run-evergreen-release.sh download-and-list-artifacts
43334333
- command: shell.exec
43344334
params:
@@ -4357,7 +4357,6 @@ functions:
43574357
node_js_version: ${node_js_version}
43584358
script: |
43594359
set -e
4360-
export PUPPETEER_SKIP_DOWNLOAD="true"
43614360
.evergreen/run-evergreen-release.sh publish -- --dry-run
43624361
43634362
release_publish:
@@ -4376,7 +4375,6 @@ functions:
43764375
node_js_version: ${node_js_version}
43774376
script: |
43784377
set -e
4379-
export PUPPETEER_SKIP_DOWNLOAD="true"
43804378
.evergreen/run-evergreen-release.sh publish
43814379
43824380
run_perf_tests:
@@ -4943,6 +4941,7 @@ tasks:
49434941
mongosh_test_id: "arg_parser"
49444942
mongosh_run_only_in_package: "arg-parser"
49454943
task_name: ${task_name}
4944+
puppeteer_skip_download: "true"
49464945
- name: test_async_rewriter2
49474946
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
49484947
depends_on:
@@ -4961,6 +4960,7 @@ tasks:
49614960
mongosh_test_id: "async_rewriter2"
49624961
mongosh_run_only_in_package: "async-rewriter2"
49634962
task_name: ${task_name}
4963+
puppeteer_skip_download: "true"
49644964
- name: test_autocomplete
49654965
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
49664966
depends_on:
@@ -4979,6 +4979,7 @@ tasks:
49794979
mongosh_test_id: "autocomplete"
49804980
mongosh_run_only_in_package: "autocomplete"
49814981
task_name: ${task_name}
4982+
puppeteer_skip_download: "true"
49824983
- name: test_browser_repl
49834984
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
49844985
depends_on:
@@ -4997,6 +4998,7 @@ tasks:
49974998
mongosh_test_id: "browser_repl"
49984999
mongosh_run_only_in_package: "browser-repl"
49995000
task_name: ${task_name}
5001+
puppeteer_skip_download: "false"
50005002
- name: test_browser_runtime_core
50015003
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50025004
depends_on:
@@ -5015,6 +5017,7 @@ tasks:
50155017
mongosh_test_id: "browser_runtime_core"
50165018
mongosh_run_only_in_package: "browser-runtime-core"
50175019
task_name: ${task_name}
5020+
puppeteer_skip_download: "true"
50185021
- name: test_browser_runtime_electron
50195022
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50205023
depends_on:
@@ -5033,6 +5036,7 @@ tasks:
50335036
mongosh_test_id: "browser_runtime_electron"
50345037
mongosh_run_only_in_package: "browser-runtime-electron"
50355038
task_name: ${task_name}
5039+
puppeteer_skip_download: "true"
50365040
- name: test_build
50375041
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50385042
depends_on:
@@ -5051,6 +5055,7 @@ tasks:
50515055
mongosh_test_id: "build"
50525056
mongosh_run_only_in_package: "build"
50535057
task_name: ${task_name}
5058+
puppeteer_skip_download: "true"
50545059
- name: test_cli_repl
50555060
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50565061
depends_on:
@@ -5069,6 +5074,7 @@ tasks:
50695074
mongosh_test_id: "cli_repl"
50705075
mongosh_run_only_in_package: "cli-repl"
50715076
task_name: ${task_name}
5077+
puppeteer_skip_download: "true"
50725078
- name: test_connectivity_tests
50735079
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50745080
depends_on:
@@ -5087,6 +5093,7 @@ tasks:
50875093
mongosh_test_id: "connectivity_tests"
50885094
mongosh_run_only_in_package: "connectivity-tests"
50895095
task_name: ${task_name}
5096+
puppeteer_skip_download: "true"
50905097
- name: test_e2e_tests
50915098
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
50925099
depends_on:
@@ -5105,6 +5112,7 @@ tasks:
51055112
mongosh_test_id: "e2e_tests"
51065113
mongosh_run_only_in_package: "e2e-tests"
51075114
task_name: ${task_name}
5115+
puppeteer_skip_download: "true"
51085116
- name: test_editor
51095117
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
51105118
depends_on:
@@ -5123,6 +5131,7 @@ tasks:
51235131
mongosh_test_id: "editor"
51245132
mongosh_run_only_in_package: "editor"
51255133
task_name: ${task_name}
5134+
puppeteer_skip_download: "true"
51265135
- name: test_errors
51275136
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
51285137
depends_on:
@@ -5141,6 +5150,7 @@ tasks:
51415150
mongosh_test_id: "errors"
51425151
mongosh_run_only_in_package: "errors"
51435152
task_name: ${task_name}
5153+
puppeteer_skip_download: "true"
51445154
- name: test_history
51455155
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
51465156
depends_on:
@@ -5159,6 +5169,7 @@ tasks:
51595169
mongosh_test_id: "history"
51605170
mongosh_run_only_in_package: "history"
51615171
task_name: ${task_name}
5172+
puppeteer_skip_download: "true"
51625173
- name: test_i18n
51635174
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
51645175
depends_on:
@@ -5177,6 +5188,7 @@ tasks:
51775188
mongosh_test_id: "i18n"
51785189
mongosh_run_only_in_package: "i18n"
51795190
task_name: ${task_name}
5191+
puppeteer_skip_download: "true"
51805192
- name: test_java_shell
51815193
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
51825194
depends_on:
@@ -5195,6 +5207,7 @@ tasks:
51955207
mongosh_test_id: "java_shell"
51965208
mongosh_run_only_in_package: "java-shell"
51975209
task_name: ${task_name}
5210+
puppeteer_skip_download: "true"
51985211
- name: test_js_multiline_to_singleline
51995212
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52005213
depends_on:
@@ -5213,6 +5226,7 @@ tasks:
52135226
mongosh_test_id: "js_multiline_to_singleline"
52145227
mongosh_run_only_in_package: "js-multiline-to-singleline"
52155228
task_name: ${task_name}
5229+
puppeteer_skip_download: "true"
52165230
- name: test_logging
52175231
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52185232
depends_on:
@@ -5231,6 +5245,7 @@ tasks:
52315245
mongosh_test_id: "logging"
52325246
mongosh_run_only_in_package: "logging"
52335247
task_name: ${task_name}
5248+
puppeteer_skip_download: "true"
52345249
- name: test_mongosh
52355250
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52365251
depends_on:
@@ -5249,6 +5264,7 @@ tasks:
52495264
mongosh_test_id: "mongosh"
52505265
mongosh_run_only_in_package: "mongosh"
52515266
task_name: ${task_name}
5267+
puppeteer_skip_download: "true"
52525268
- name: test_node_runtime_worker_thread
52535269
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52545270
depends_on:
@@ -5267,6 +5283,7 @@ tasks:
52675283
mongosh_test_id: "node_runtime_worker_thread"
52685284
mongosh_run_only_in_package: "node-runtime-worker-thread"
52695285
task_name: ${task_name}
5286+
puppeteer_skip_download: "true"
52705287
- name: test_service_provider_core
52715288
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52725289
depends_on:
@@ -5285,6 +5302,7 @@ tasks:
52855302
mongosh_test_id: "service_provider_core"
52865303
mongosh_run_only_in_package: "service-provider-core"
52875304
task_name: ${task_name}
5305+
puppeteer_skip_download: "true"
52885306
- name: test_service_provider_node_driver
52895307
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
52905308
depends_on:
@@ -5303,6 +5321,7 @@ tasks:
53035321
mongosh_test_id: "service_provider_node_driver"
53045322
mongosh_run_only_in_package: "service-provider-node-driver"
53055323
task_name: ${task_name}
5324+
puppeteer_skip_download: "true"
53065325
- name: test_shell_api
53075326
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
53085327
depends_on:
@@ -5321,6 +5340,7 @@ tasks:
53215340
mongosh_test_id: "shell_api"
53225341
mongosh_run_only_in_package: "shell-api"
53235342
task_name: ${task_name}
5343+
puppeteer_skip_download: "true"
53245344
- name: test_shell_evaluator
53255345
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
53265346
depends_on:
@@ -5339,6 +5359,7 @@ tasks:
53395359
mongosh_test_id: "shell_evaluator"
53405360
mongosh_run_only_in_package: "shell-evaluator"
53415361
task_name: ${task_name}
5362+
puppeteer_skip_download: "true"
53425363
- name: test_snippet_manager
53435364
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
53445365
depends_on:
@@ -5357,6 +5378,7 @@ tasks:
53575378
mongosh_test_id: "snippet_manager"
53585379
mongosh_run_only_in_package: "snippet-manager"
53595380
task_name: ${task_name}
5381+
puppeteer_skip_download: "true"
53605382
- name: test_types
53615383
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
53625384
depends_on:
@@ -5375,6 +5397,7 @@ tasks:
53755397
mongosh_test_id: "types"
53765398
mongosh_run_only_in_package: "types"
53775399
task_name: ${task_name}
5400+
puppeteer_skip_download: "true"
53785401

53795402
###
53805403
# INTEGRATION TESTS

‎.evergreen/compile-artifact.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ trap "rm -rf /tmp/m" EXIT
2222
export TMP=/tmp/m
2323
export TMPDIR=/tmp/m
2424

25-
if [ `uname` = Darwin ]; then
25+
if [ $(uname) = Darwin ]; then
2626
# match what Node.js 20 does on their own builder machines
2727
export CFLAGS='-mmacosx-version-min=10.15'
2828
export CXXFLAGS='-mmacosx-version-min=10.15'
@@ -76,7 +76,6 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7676
export LD_LIBRARY_PATH=/opt/devtools/lib:/tmp/m/opt/lib
7777
fi
7878

79-
export PUPPETEER_SKIP_DOWNLOAD="true"
8079
npm run evergreen-release compile
8180
dist/mongosh --version
8281
dist/mongosh --build-info

‎.evergreen/evergreen.yml.in‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ functions:
130130
NODE_JS_VERSION: ${node_js_version}
131131
DISTRO_ID: ${distro_id}
132132
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
133+
PUPPETEER_SKIP_DOWNLOAD: "true"
133134
script: |
134135
set -e
135136
set -x
@@ -170,6 +171,7 @@ functions:
170171
NODE_JS_VERSION: ${node_js_version}
171172
DISTRO_ID: ${distro_id}
172173
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
174+
PUPPETEER_SKIP_DOWNLOAD: ${puppeteer_skip_download|true}
173175
script: |
174176
set -e
175177
set -x
@@ -953,7 +955,6 @@ functions:
953955
{
954956
export NODE_JS_VERSION=${node_js_version}
955957
source .evergreen/setup-env.sh
956-
export PUPPETEER_SKIP_DOWNLOAD="true"
957958
npm run evergreen-release draft
958959
git add .
959960
git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -973,7 +974,6 @@ functions:
973974
node_js_version: ${node_js_version}
974975
script: |
975976
set -e
976-
export PUPPETEER_SKIP_DOWNLOAD="true"
977977
.evergreen/run-evergreen-release.sh download-and-list-artifacts
978978
- command: shell.exec
979979
params:
@@ -1002,7 +1002,6 @@ functions:
10021002
node_js_version: ${node_js_version}
10031003
script: |
10041004
set -e
1005-
export PUPPETEER_SKIP_DOWNLOAD="true"
10061005
.evergreen/run-evergreen-release.sh publish -- --dry-run
10071006

10081007
release_publish:
@@ -1021,7 +1020,6 @@ functions:
10211020
node_js_version: ${node_js_version}
10221021
script: |
10231022
set -e
1024-
export PUPPETEER_SKIP_DOWNLOAD="true"
10251023
.evergreen/run-evergreen-release.sh publish
10261024

10271025
run_perf_tests:
@@ -1101,7 +1099,7 @@ tasks:
11011099
# UNIT TESTS
11021100
# E.g. test_m60xc_n20 stands for mongod 6.0.x, community edition, Node.js 20
11031101
###
1104-
<% for (const { id, packageName } of UNIT_TESTS) { %>
1102+
<% for (const { id, packageName, usePuppeteer } of UNIT_TESTS) { %>
11051103
- name: test_<% out(id) %>
11061104
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
11071105
depends_on:
@@ -1120,6 +1118,7 @@ tasks:
11201118
mongosh_test_id: "<% out(id) %>"
11211119
mongosh_run_only_in_package: "<% out(packageName) %>"
11221120
task_name: ${task_name}
1121+
puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
11231122
<% } %>
11241123

11251124
###

‎.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 \
16+
docker run \
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#! /usr/bin/env bash
22
set -e
33

4-
echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
4+
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"
98
npm run evergreen-release $@

‎.evergreen/tasks/unit-tests.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ for (const packageInfo of MONGOSH_PACKAGES) {
3333
UNIT_TESTS.push({
3434
id,
3535
packageName: packageInfo.name,
36-
unitTestsOnly: packageInfo.unitTestsOnly,
36+
unitTestsOnly: packageInfo.unitTestsOnly || false,
37+
usePuppeteer: packageInfo.usePuppeteer || false,
3738
variants,
3839
});
3940
}

‎packages/browser-repl/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
},
5252
"mongosh": {
5353
"unitTestsOnly": true,
54+
"usePuppeteer": true,
5455
"variants": [
5556
"darwin"
5657
]

‎packages/build/src/npm-packages/bump.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ export class PackageBumper {
8181
stdio: 'inherit',
8282
cwd: monorepoRootPath,
8383
encoding: 'utf8',
84+
env: {
85+
...process.env,
86+
PUPPETEER_SKIP_DOWNLOAD: 'true',
87+
},
8488
});
8589
}
8690

0 commit comments

Comments
 (0)