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

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

Issue 1506073002: Switch remaining bots to new Telemetry GPU isolate. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebased again. Created 5 years 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 b1f73dec2e169f9f3f1df71f8ab40ad6bb8c308f..4e06d261895166d067d39bb9e52fda925eefa284 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -833,7 +833,7 @@ def GenTests(api):
gpu_targets = ['angle_unittests_run', 'chrome', 'chromium_builder_tests',
'content_gl_tests_run', 'gl_tests_run',
- 'tab_capture_end2end_tests_run', 'telemetry_gpu_test_run']
+ 'tab_capture_end2end_tests_run', 'telemetry_gpu_new_test_run']
yield (
api.test('gpu_tests') +
props(
@@ -843,12 +843,14 @@ def GenTests(api):
api.platform.name('mac') +
api.override_step_data(
'pixel_test on Intel GPU on Mac (with patch)',
- api.test_utils.canned_telemetry_gpu_output(
- passing=False, is_win=False, swarming=True)) +
+ api.test_utils.canned_isolated_script_output(
+ passing=False, is_win=False, swarming=True,
+ isolated_script_passing=False)) +
api.override_step_data(
'pixel_test on Intel GPU on Mac (without patch)',
- api.test_utils.canned_telemetry_gpu_output(
- passing=False, is_win=False, swarming=True)) +
+ api.test_utils.canned_isolated_script_output(
+ passing=False, is_win=False, swarming=True,
+ isolated_script_passing=False)) +
api.override_step_data('analyze',
api.json.output({'status': 'Found dependency',
'compile_targets': gpu_targets,
@@ -856,21 +858,6 @@ def GenTests(api):
)
yield (
- api.test('telemetry_gpu_no_summary') +
- props(
- mastername='tryserver.chromium.mac',
- buildername='mac_chromium_rel_ng',
- ) +
- api.platform.name('mac') +
- api.override_step_data('pixel_test on Intel GPU on Mac (with patch)',
- api.raw_io.output_dir({'0/results.json': ''})) +
- api.override_step_data('analyze',
- api.json.output({'status': 'Found dependency',
- 'test_targets': gpu_targets,
- 'compile_targets': gpu_targets}))
- )
-
- yield (
api.test('telemetry_gpu_harness_failure') +
props(
mastername='tryserver.chromium.linux',
@@ -879,9 +866,8 @@ def GenTests(api):
api.platform.name('linux') +
api.override_step_data(
'maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux',
- api.test_utils.canned_telemetry_gpu_output(
- passing=False, is_win=False, swarming=True,
- empty_per_page_values=True),
+ api.test_utils.canned_isolated_script_output(
+ passing=False, is_win=False, swarming=True),
retcode=255) +
api.override_step_data('analyze',
api.json.output({'status': 'Found dependency',
@@ -898,29 +884,9 @@ def GenTests(api):
api.platform.name('mac') +
api.override_step_data(
'pixel_test on Intel GPU on Mac (with patch)',
- api.raw_io.output_dir({
- '0/results.json': '',
- 'summary.json': '{"shards": [{"internal_failure": true}]}'
- })) +
- api.override_step_data('analyze',
- api.json.output({'status': 'Found dependency',
- 'test_targets': gpu_targets,
- 'compile_targets': gpu_targets}))
- )
-
- yield (
- api.test('telemetry_gpu_no_results') +
- props(
- mastername='tryserver.chromium.mac',
- buildername='mac_chromium_rel_ng',
- ) +
- api.platform.name('mac') +
- api.override_step_data(
- 'pixel_test on Intel GPU on Mac (with patch)',
- api.raw_io.output_dir({
- '0/results.json': '',
- 'summary.json': '{"shards": [{"internal_failure": false}]}'
- })) +
+ api.test_utils.canned_isolated_script_output(
+ passing=False, is_win=False, swarming=True,
+ swarming_internal_failure=True)) +
api.override_step_data('analyze',
api.json.output({'status': 'Found dependency',
'test_targets': gpu_targets,
@@ -937,7 +903,7 @@ def GenTests(api):
# passing=True, but exit code != 0.
api.override_step_data(
'pixel_test on Intel GPU on Mac (with patch)',
- api.test_utils.canned_telemetry_gpu_output(
+ api.test_utils.canned_isolated_script_output(
passing=True, is_win=False, swarming=True),
retcode=255
) +

Powered by Google App Engine
This is Rietveld 408576698