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

Unified Diff: scripts/slave/recipes/chromium_trybot.py

Issue 620703002: Add isolate.clean_isolated_files and use in all related recipes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 6 years, 3 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/chromium_trybot.py
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
index 02f74fb7ebdf31438b2e0db38600842864c63b10..ee3a5811c8debe438e216d7db6c60d44461fe160 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -854,6 +854,9 @@ def GenSteps(api):
deapply_patch(bot_update_step)
raise
+ if bot_config.get('use_isolate') or has_swarming_tests:
+ api.isolate.clean_isolated_files(api.chromium.output_dir)
+
compile_targets.extend(api.itertools.chain(
*[t.compile_targets(api) for t in tests]))
# Remove duplicate targets.
@@ -951,17 +954,19 @@ def GenSteps(api):
if compile_targets:
# Remove duplicate targets.
compile_targets = sorted(set(compile_targets))
+ # Search for *.isolated only if enabled in bot config or if some
+ # swarming test is being recompiled.
+ bot_config = get_bot_config(mastername, buildername)
+ has_failing_swarming_tests = [
+ t for t in failing_tests if t.uses_swarming]
+ if bot_config.get('use_isolate') or has_failing_swarming_tests:
+ api.isolate.clean_isolated_files(api.chromium.output_dir)
try:
api.chromium.compile(
compile_targets, name='compile (without patch)')
except api.step.StepFailure:
api.tryserver.set_transient_failure_tryjob_result()
raise
- # Search for *.isolated only if enabled in bot config or if some
- # swarming test is being recompiled.
- bot_config = get_bot_config(mastername, buildername)
- has_failing_swarming_tests = [
- t for t in failing_tests if t.uses_swarming]
if bot_config.get('use_isolate') or has_failing_swarming_tests:
api.isolate.find_isolated_tests(api.chromium.output_dir)

Powered by Google App Engine
This is Rietveld 408576698