Skip to content

Commit

Permalink
Revert "chore(ci): never download chromium in CI MONGOSH-1942 (#2295)"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
addaleax committed Jan 6, 2025
1 parent b4e528d commit 1aef31b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4272,6 +4272,7 @@ functions:
{
export NODE_JS_VERSION=${node_js_version}
source .evergreen/setup-env.sh
export PUPPETEER_SKIP_DOWNLOAD="true"
npm run evergreen-release draft
}
Expand All @@ -4289,6 +4290,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh download-and-list-artifacts
- command: shell.exec
params:
Expand Down Expand Up @@ -4317,6 +4319,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh publish -- --dry-run
release_publish:
Expand All @@ -4335,6 +4338,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh publish
run_perf_tests:
Expand Down
1 change: 1 addition & 0 deletions .evergreen/compile-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
export LD_LIBRARY_PATH=/tmp/m/opt/lib
fi

export PUPPETEER_SKIP_DOWNLOAD="true"
npm run evergreen-release compile
dist/mongosh --version
dist/mongosh --build-info
Expand Down
4 changes: 4 additions & 0 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,7 @@ functions:
{
export NODE_JS_VERSION=${node_js_version}
source .evergreen/setup-env.sh
export PUPPETEER_SKIP_DOWNLOAD="true"
npm run evergreen-release draft
}

Expand All @@ -934,6 +935,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh download-and-list-artifacts
- command: shell.exec
params:
Expand Down Expand Up @@ -962,6 +964,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh publish -- --dry-run

release_publish:
Expand All @@ -980,6 +983,7 @@ functions:
node_js_version: ${node_js_version}
script: |
set -e
export PUPPETEER_SKIP_DOWNLOAD="true"
.evergreen/run-evergreen-release.sh publish

run_perf_tests:
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/package-and-upload-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
(cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
echo Starting Docker container packaging
docker run -e PUPPETEER_SKIP_DOWNLOAD=1 \
docker run -e PUPPETEER_SKIP_DOWNLOAD \
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
-e NODE_JS_VERSION \
-e PACKAGE_VARIANT \
Expand Down
1 change: 1 addition & 0 deletions .evergreen/run-evergreen-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
set -x
export NODE_JS_VERSION=${node_js_version}
source .evergreen/setup-env.sh
export PUPPETEER_SKIP_DOWNLOAD="true"
npm run evergreen-release $@
1 change: 0 additions & 1 deletion .evergreen/setup-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
export IS_MONGOSH_EVERGREEN_CI=1
export DEBUG="mongodb*,$DEBUG"
export PUPPETEER_SKIP_DOWNLOAD="true"

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

0 comments on commit 1aef31b

Please sign in to comment.