Skip to content

Commit

Permalink
Revert "Re-adding dummy benchamrks to chromium debug waterfalls."
Browse files Browse the repository at this point in the history
This reverts commit 81715b6.

Reason for revert: Breaks on Win10 Tests x64 (dbg).

"""
BrowserFinderException: Cannot find browser of type debug. 

Available browsers:
debug_x64
reference
"""

and

"""
Traceback (most recent call last):
  File "..\..\testing\scripts\run_performance_tests.py", line 312, in <module>
    sys.exit(main())
  File "..\..\testing\scripts\run_performance_tests.py", line 284, in main
    sharding = sharding_map[shard_index]['benchmarks']
KeyError: '7'
"""

depending on shard number

Original change's description:
> Re-adding dummy benchamrks to chromium debug waterfalls.
> 
> Previously
> reviewed here: https://chromium-review.googlesource.com/c/chromium/src/+/1055776
> and then reverted.
> 
> We have to set the browser for each configuration that we run on.
> It will be one of debug, release or android-chromium.  We can do this one
> of two ways:
> 
> 1) multiple entries in test_suites.pyl
> 2) add each entry in test_suite_exceptions.pyl
> 
> Although #1 is less verbose I think #2 is how these files are intended
> to be used.
> 
> Bug: 840427
> Change-Id: Idff4c36a248215dbfdf0faed45b483800046bf26
> Reviewed-on: https://chromium-review.googlesource.com/1066088
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Commit-Queue: Emily Hanley <eyaich@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#560571}

TBR=nednguyen@google.com,eyaich@chromium.org,jbudorick@chromium.org

Change-Id: I89ca43c0eb6292ee252c459e1db94749bfb603b0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 840427,845543
Reviewed-on: https://chromium-review.googlesource.com/1069420
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560744}
  • Loading branch information
jeremyroman authored and Commit Bot committed May 22, 2018
1 parent ebc94b5 commit 4e653b2
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 111 deletions.
20 changes: 0 additions & 20 deletions testing/buildbot/chromium.mac.json
Original file line number Diff line number Diff line change
Expand Up @@ -2374,26 +2374,6 @@
"can_use_on_swarming_builders": true
}
},
{
"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": 12
}
},
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
Expand Down
40 changes: 0 additions & 40 deletions testing/buildbot/chromium.win.json
Original file line number Diff line number Diff line change
Expand Up @@ -1683,26 +1683,6 @@
"can_use_on_swarming_builders": true
}
},
{
"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": 12
}
},
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
Expand Down Expand Up @@ -2944,26 +2924,6 @@
"can_use_on_swarming_builders": true
}
},
{
"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": 12
}
},
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
Expand Down
19 changes: 0 additions & 19 deletions testing/buildbot/test_suite_exceptions.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -2230,25 +2230,6 @@
'Linux TSan Tests',
],
},
'performance_test_suite': {
'modifications': {
'Mac10.13 Tests (dbg)': {
'args': [
'--browser=debug',
],
},
'Win10 Tests x64 (dbg)': {
'args': [
'--browser=debug',
],
},
'Win7 Tests (dbg)(1)': {
'args': [
'--browser=debug',
],
},
}
},
'telemetry_perf_unittests': {
'modifications': {
# chromium.android
Expand Down
20 changes: 0 additions & 20 deletions testing/buildbot/test_suites.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -1563,25 +1563,6 @@
'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': 12,
},
'merge': {
'args': [
'--smoke-test-mode',
],
'script': '//tools/perf/process_perf_results.py',
},
},
},

'telemetry_perf_unittests_isolated_scripts': {
'telemetry_perf_unittests': {
'swarming': {
Expand Down Expand Up @@ -1799,7 +1780,6 @@
'chromium_dbg_isolated_scripts': [
'desktop_chromium_isolated_scripts',
'telemetry_perf_unittests_isolated_scripts',
'performance_smoke_test_isolated_scripts',
],

'chromium_rel_isolated_scripts': [
Expand Down
12 changes: 0 additions & 12 deletions tools/perf/core/smoke_test_benchmark_shard_map.json

This file was deleted.

0 comments on commit 4e653b2

Please sign in to comment.