diff options
Diffstat (limited to 'infra/bots')
5 files changed, 8 insertions, 6 deletions
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 e520e21b3f..2fdcad62fe 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 ea85e6e78c..9be48d4af1 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 e318463b37..43e694c384 100644 --- a/infra/bots/recipes/swarm_housekeeper.py +++ b/infra/bots/recipes/swarm_housekeeper.py @@ -42,7 +42,8 @@ def RunSteps(api): # 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 a5a2dcc561..2c31930ee4 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 a2727309cf..04e55649ea 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -489,7 +489,8 @@ def perf_steps_collect(api, task, got_revision, is_trybot): 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: |