Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: scripts/slave/recipes/skia/ct_skps.py

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/ct_skps.py
diff --git a/scripts/slave/recipes/skia/ct_skps.py b/scripts/slave/recipes/skia/ct_skps.py
index 142c89b5b707dd8601245c81ff762d3a4a2d3740..eec8f543f87b366e0f9f8557df24bde8f45420db 100644
--- a/scripts/slave/recipes/skia/ct_skps.py
+++ b/scripts/slave/recipes/skia/ct_skps.py
@@ -9,7 +9,6 @@ DEPS = [
'ct',
'file',
'depot_tools/gclient',
- 'depot_tools/infra_paths',
'gsutil',
'recipe_engine/path',
'recipe_engine/properties',
@@ -102,7 +101,7 @@ def RunSteps(api):
# Ensure swarming_client is compatible with what recipes expect.
api.swarming.check_client_version()
# Setup Go isolate binary.
- chromium_checkout = api.infra_paths['slave_build'].join('src')
+ chromium_checkout = api.path['slave_build'].join('src')
api.skia_swarming.setup_go_isolate(chromium_checkout.join('tools', 'luci-go'))
# Apply issue to the Skia checkout if this is a trybot run.
@@ -128,7 +127,7 @@ def RunSteps(api):
# Download SKPs.
api.ct.download_skps(
ct_page_type, slave_num, skps_chromium_build,
- api.infra_paths['slave_build'].join('skps'))
+ api.path['slave_build'].join('skps'))
# Create this slave's isolated.gen.json file to use for batcharchiving.
isolate_dir = chromium_checkout.join('chrome')
@@ -218,9 +217,9 @@ def GenTests(api):
ct_num_slaves=ct_num_slaves,
revision=skia_revision,
) +
- api.infra_paths.exists(
- api.infra_paths['slave_build'].join('skia'),
- api.infra_paths['slave_build'].join('src')
+ api.path.exists(
+ api.path['slave_build'].join('skia'),
+ api.path['slave_build'].join('src')
)
)

Powered by Google App Engine
This is Rietveld 408576698