From 03d8ad476ab62c669697f6046a3e0d2790ae18e0 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Tue, 10 Dec 2024 10:40:33 -0500
Subject: [PATCH] chore(ci): never download chromium in CI

This turns out to be just unnecessary, according to trying this out
in a patch build.
---
 .evergreen.yml                            | 4 ----
 .evergreen/compile-artifact.sh            | 1 -
 .evergreen/evergreen.yml.in               | 4 ----
 .evergreen/package-and-upload-artifact.sh | 2 +-
 .evergreen/run-evergreen-release.sh       | 1 -
 .evergreen/setup-env.sh                   | 1 +
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index b7a6d2b52..8a4ff894d 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -7590,7 +7590,6 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           npm run evergreen-release draft
           }
 
@@ -7608,7 +7607,6 @@ 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:
@@ -7637,7 +7635,6 @@ 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:
@@ -7656,7 +7653,6 @@ 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 683b683ff..7a23e6865 100755
--- a/.evergreen/compile-artifact.sh
+++ b/.evergreen/compile-artifact.sh
@@ -74,7 +74,6 @@ 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 73c0062a1..4d94a35e6 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -1002,7 +1002,6 @@ functions:
           {
           export NODE_JS_VERSION=${node_js_version}
           source .evergreen/setup-env.sh
-          export PUPPETEER_SKIP_DOWNLOAD="true"
           npm run evergreen-release draft
           }
 
@@ -1020,7 +1019,6 @@ 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:
@@ -1049,7 +1047,6 @@ 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:
@@ -1068,7 +1065,6 @@ 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 963858d6d..3729d8af8 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 \
+  docker run -e PUPPETEER_SKIP_DOWNLOAD=1 \
     -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 53e622c27..c178e9176 100755
--- a/.evergreen/run-evergreen-release.sh
+++ b/.evergreen/run-evergreen-release.sh
@@ -5,5 +5,4 @@ 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 3d286a213..f822c8068 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -16,6 +16,7 @@ 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