diff --git a/.evergreen.yml b/.evergreen.yml index b757c36cc..5824b0e58 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -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 } @@ -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: @@ -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: @@ -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: diff --git a/.evergreen/compile-artifact.sh b/.evergreen/compile-artifact.sh index 7a23e6865..683b683ff 100755 --- a/.evergreen/compile-artifact.sh +++ b/.evergreen/compile-artifact.sh @@ -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 diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index 6be696270..2d62cdd35 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -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 } @@ -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: @@ -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: @@ -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: diff --git a/.evergreen/package-and-upload-artifact.sh b/.evergreen/package-and-upload-artifact.sh index 3729d8af8..963858d6d 100755 --- a/.evergreen/package-and-upload-artifact.sh +++ b/.evergreen/package-and-upload-artifact.sh @@ -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 \ diff --git a/.evergreen/run-evergreen-release.sh b/.evergreen/run-evergreen-release.sh index c178e9176..53e622c27 100755 --- a/.evergreen/run-evergreen-release.sh +++ b/.evergreen/run-evergreen-release.sh @@ -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 $@ diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh index f822c8068..3d286a213 100755 --- a/.evergreen/setup-env.sh +++ b/.evergreen/setup-env.sh @@ -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