Index: build/android/buildbot/bb_run_bot.py |
diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py |
index 878e36a92851c3ff789b0bf977038ea3719e83ca..7dbd2111588df2a5edb6df444cb6c30eef7eb6bd 100755 |
--- a/build/android/buildbot/bb_run_bot.py |
+++ b/build/android/buildbot/bb_run_bot.py |
@@ -144,8 +144,9 @@ def GetBotStepMap(): |
B('main-clobber', H(compile_step)), |
B('main-tests-rel', H(std_test_steps), |
T(std_tests + telemetry_tests + chrome_proxy_tests, |
- [flakiness_server])), |
- B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])), |
+ ['--cleanup', flakiness_server])), |
+ B('main-tests', H(std_test_steps), |
+ T(std_tests,['--cleanup', flakiness_server])), |
# Other waterfalls |
B('asan-builder-tests', H(compile_step, |
@@ -153,7 +154,8 @@ def GetBotStepMap(): |
T(std_tests, ['--asan', '--asan-symbolize'])), |
B('blink-try-builder', H(compile_step)), |
B('chromedriver-fyi-tests-dbg', H(std_test_steps), |
- T(['chromedriver'], ['--install=ChromeShell', '--skip-wipe'])), |
+ T(['chromedriver'], ['--install=ChromeShell', '--skip-wipe', |
+ '--cleanup'])), |
B('fyi-x86-builder-dbg', |
H(compile_step + std_host_tests, experimental, target_arch='x86')), |
B('fyi-builder-dbg', |
@@ -164,7 +166,8 @@ def GetBotStepMap(): |
B('fyi-builder-rel', H(std_build_steps, experimental)), |
B('fyi-tests', H(std_test_steps), |
T(std_tests, ['--experimental', flakiness_server, |
- '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET])), |
+ '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET, |
+ '--cleanup'])), |
B('fyi-component-builder-tests-dbg', |
H(compile_step, extra_gyp='component=shared_library'), |
T(std_tests, ['--experimental', flakiness_server])), |
@@ -176,9 +179,9 @@ def GetBotStepMap(): |
H(['bisect_perf_regression']), |
T([], ['--chrome-output-dir', bisect_chrome_output_dir])), |
B('perf-tests-rel', H(std_test_steps), |
- T([], ['--install=ChromeShell'])), |
+ T([], ['--install=ChromeShell', '--cleanup'])), |
B('webkit-latest-webkit-tests', H(std_test_steps), |
- T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), |
+ T(['webkit_layout', 'webkit'], ['--cleanup', '--auto-reconnect'])), |
B('webkit-latest-contentshell', H(compile_step), |
T(['webkit_layout'], ['--auto-reconnect'])), |
B('builder-unit-tests', H(compile_step), T(['unit'])), |
@@ -191,9 +194,9 @@ def GetBotStepMap(): |
extra_gyp='include_tests=1 enable_tracing=1')), |
B('webrtc-chromium-tests', H(std_test_steps), |
T(['webrtc_chromium'], |
- [flakiness_server, '--gtest-filter=WebRtc*'])), |
+ [flakiness_server, '--gtest-filter=WebRtc*', '--cleanup'])), |
B('webrtc-native-tests', H(std_test_steps), |
- T(['webrtc_native'], [flakiness_server])), |
+ T(['webrtc_native'], ['--cleanup', flakiness_server])), |
# Generic builder config (for substring match). |
B('builder', H(std_build_steps)), |