pw_env_setup: Remove gsutil from PATH

Keep the LUCI gsutil executable in the environment, but move it to where it won't be in PATH. It's needed for coverage builds, but it shouldn't be used by developers except explicitly. Bug: b/396199506 Change-Id: Icfb461ba51c145e058724fc8cd463b90e17f8d94 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/268153 Presubmit-Verified: CQ Bot Account <[email protected]> Lint: Lint 🤖 <[email protected]> Reviewed-by: Ted Pudlik <[email protected]> Reviewed-by: William Abajian <[email protected]> Pigweed-Auto-Submit: Rob Mohr <[email protected]> Docs-Not-Needed: Rob Mohr <[email protected]> Commit-Queue: Auto-Submit <[email protected]>
google · Feb 15, 2025 · 264303d · 264303d
1 parent 416b03b
commit 264303d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/luci.json b/pw_env_setup/py/pw_env_setup/cipd_setup/luci.json
@@ -132,6 +132,7 @@
         "mac-amd64",
         "mac-arm64"
       ],
+      "subdir": "gsutil",
       "tags": [
         "version:[email protected]"
       ]

diff --git a/pw_presubmit/py/pw_presubmit/build.py b/pw_presubmit/py/pw_presubmit/build.py
@@ -1023,12 +1023,10 @@ def _coverage_substeps(self) -> Iterator[SubStep]:
 
 
 def _copy_to_gcs(ctx: PresubmitContext, filepath: Path, gcs_dst: str):
-    cmd = [
-        "gsutil",
-        "cp",
-        filepath,
-        gcs_dst,
-    ]
+    luci = Path(pw_cli.env.pigweed_environment().PW_LUCI_CIPD_INSTALL_DIR)
+    gsutil = luci / 'gsutil' / 'gsutil'
+
+    cmd = [gsutil, 'cp', filepath, gcs_dst]
 
     upload_stdout = ctx.output_dir / (filepath.name + '.stdout')
     with upload_stdout.open('w') as outs: