Skip to content

Commit 642f5c0

Browse files
authored
Revert "chore(ci): never download chromium in CI MONGOSH-1942 (#2295)" (#2311)
This reverts commit 5f5ea25. We do actually need this in macOS CI, this just happened to work a lot of the time because macOS hosts are static hosts and apparently an already-installed chromium persists on those. In order to keep things simple and keep CI green, let's just revert this for now.
1 parent f29362b commit 642f5c0

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

.evergreen.yml

Lines changed: 4 additions & 0 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:

.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: 4 additions & 0 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
}
922923

@@ -934,6 +935,7 @@ functions:
934935
node_js_version: ${node_js_version}
935936
script: |
936937
set -e
938+
export PUPPETEER_SKIP_DOWNLOAD="true"
937939
.evergreen/run-evergreen-release.sh download-and-list-artifacts
938940
- command: shell.exec
939941
params:
@@ -962,6 +964,7 @@ functions:
962964
node_js_version: ${node_js_version}
963965
script: |
964966
set -e
967+
export PUPPETEER_SKIP_DOWNLOAD="true"
965968
.evergreen/run-evergreen-release.sh publish -- --dry-run
966969

967970
release_publish:
@@ -980,6 +983,7 @@ functions:
980983
node_js_version: ${node_js_version}
981984
script: |
982985
set -e
986+
export PUPPETEER_SKIP_DOWNLOAD="true"
983987
.evergreen/run-evergreen-release.sh publish
984988

985989
run_perf_tests:

.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

0 commit comments

Comments
 (0)