Re-landing dummy benchmarks for the third time.
NOTRY=true
Bug: 840427
Change-Id: I3c1336cccc6e0af88aea9b7ad5e7d10a8cdd5b6f
Reviewed-on: https://chromium-review.googlesource.com/1069659
Commit-Queue: Emily Hanley <[email protected]>
Reviewed-by: Stephen Martinis <[email protected]>
Cr-Commit-Position: refs/heads/master@{#561849}diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 171e27dd..e47dd2adb0 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -2375,6 +2375,26 @@
}
},
{
+ "args": [
+ "--smoke-test-mode",
+ "--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
+ "--browser=debug"
+ ],
+ "isolate_name": "performance_test_suite",
+ "merge": {
+ "args": [
+ "--smoke-test-mode"
+ ],
+ "script": "//tools/perf/process_perf_results.py"
+ },
+ "name": "performance_test_suite",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "hard_timeout": 960,
+ "shards": 2
+ }
+ },
+ {
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
"swarming": {
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 59f04fd..a51cb9f 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1710,6 +1710,26 @@
}
},
{
+ "args": [
+ "--smoke-test-mode",
+ "--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
+ "--browser=debug_x64"
+ ],
+ "isolate_name": "performance_test_suite",
+ "merge": {
+ "args": [
+ "--smoke-test-mode"
+ ],
+ "script": "//tools/perf/process_perf_results.py"
+ },
+ "name": "performance_test_suite",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "hard_timeout": 960,
+ "shards": 2
+ }
+ },
+ {
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
"swarming": {
@@ -2963,6 +2983,26 @@
}
},
{
+ "args": [
+ "--smoke-test-mode",
+ "--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
+ "--browser=debug"
+ ],
+ "isolate_name": "performance_test_suite",
+ "merge": {
+ "args": [
+ "--smoke-test-mode"
+ ],
+ "script": "//tools/perf/process_perf_results.py"
+ },
+ "name": "performance_test_suite",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "hard_timeout": 960,
+ "shards": 2
+ }
+ },
+ {
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
"swarming": {
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index cc05daa..285891a 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -2167,6 +2167,25 @@
'Linux TSan Tests',
],
},
+ 'performance_test_suite': {
+ 'modifications': {
+ 'Mac10.13 Tests (dbg)': {
+ 'args': [
+ '--browser=debug',
+ ],
+ },
+ 'Win10 Tests x64 (dbg)': {
+ 'args': [
+ '--browser=debug_x64',
+ ],
+ },
+ 'Win7 Tests (dbg)(1)': {
+ 'args': [
+ '--browser=debug',
+ ],
+ },
+ }
+ },
'telemetry_perf_unittests': {
'modifications': {
# chromium.android
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index e653c057..c87743b 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -1569,6 +1569,25 @@
'system_webview_shell_layout_test_apk': {},
},
+ 'performance_smoke_test_isolated_scripts': {
+ 'performance_test_suite': {
+ 'args': [
+ '--smoke-test-mode',
+ '--test-shard-map-filename=smoke_test_benchmark_shard_map.json'
+ ],
+ 'swarming': {
+ 'hard_timeout': 960,
+ 'shards': 2,
+ },
+ 'merge': {
+ 'args': [
+ '--smoke-test-mode',
+ ],
+ 'script': '//tools/perf/process_perf_results.py',
+ },
+ },
+ },
+
'telemetry_perf_unittests_isolated_scripts': {
'telemetry_perf_unittests': {
'swarming': {
@@ -1787,6 +1806,7 @@
'chromium_dbg_isolated_scripts': [
'desktop_chromium_isolated_scripts',
'telemetry_perf_unittests_isolated_scripts',
+ 'performance_smoke_test_isolated_scripts',
],
'chromium_rel_isolated_scripts': [
