Revert of Skia recipe: Use [depot_tools]/gsutil.py instead of [depot_tools]/third_party/gsutil/gsutil (patchset #1 id:1 of https://codereview.chromium.org/2298293002/ )
Reason for revert:
Broke all nanobench uploads, eg. https://uberchromegw.corp.google.com/i/client.skia.android/builders/Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android/builds/154/steps/Upload%20perf%20results/logs/stdio
Original issue's description:
> Skia recipe: Use [depot_tools]/gsutil.py instead of [depot_tools]/third_party/gsutil/gsutil
>
> The latter is being removed in https://codereview.chromium.org/2280023003/
> Is also pinned to 3.25, whereas the former is updated more often.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2298293002
>
> Committed: https://skia.googlesource.com/skia/+/f15590f803596f51d0950994b2aeb623d2d1fc24
TBR=hinoka@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2355943002
diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
index e520e21..2fdcad6 100644
--- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
+++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
@@ -43,7 +43,7 @@
"--githash",
"abc123",
"--gsutil_path",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
"--issue_number",
"500"
],
diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json
index ea85e6e..9be48d4 100644
--- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json
+++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json
@@ -38,7 +38,7 @@
"cmd": [
"python",
"RECIPE_MODULE[skia::core]/resources/generate_and_upload_doxygen.py",
- "[DEPOT_TOOLS]/gsutil.py"
+ "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
@@ -57,7 +57,7 @@
"--githash",
"abc123",
"--gsutil_path",
- "[DEPOT_TOOLS]/gsutil.py"
+ "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py
index e318463..43e694c 100644
--- a/infra/bots/recipes/swarm_housekeeper.py
+++ b/infra/bots/recipes/swarm_housekeeper.py
@@ -42,7 +42,8 @@
# TODO(borenet): Detect static initializers?
- gsutil_path = api.path['depot_tools'].join('gsutil.py')
+ gsutil_path = api.path['depot_tools'].join('third_party', 'gsutil',
+ 'gsutil')
if not api.vars.is_trybot:
api.run(
api.step,
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
index a5a2dcc..2c31930 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
@@ -839,7 +839,7 @@
"5",
"[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot/data",
"abc123",
- "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/depot_tools/gsutil.py",
+ "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/depot_tools/third_party/gsutil/gsutil",
"500"
],
"cwd": "[SLAVE_BUILD]/skia",
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index a272730..04e5564 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -489,7 +489,8 @@
infra_step=True)
gsutil_path = api.path['slave_build'].join(
- 'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'gsutil.py')
+ 'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party',
+ 'gsutil', 'gsutil')
upload_args = [api.properties['buildername'], api.properties['buildnumber'],
perf_data_dir, got_revision, gsutil_path]
if is_trybot: