Skip to content

Commit

Permalink
Custom perf merge/upload logic
Browse files Browse the repository at this point in the history 
Still need to generate oauth tokens, locate step name, update a few other small fields, and add tests but wanted to get the updated in progress version checked in.

In its current state, it cancels uploading the results because there is
no oauth token available.

Bug: 758632
Change-Id: Ie861b9518bc16640d0a7cf44a3e1d8c5ca60c8e2
Reviewed-on: https://chromium-review.googlesource.com/893539
Commit-Queue: Ashley Enstad <ashleymarie@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Emily Hanley <eyaich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535286}
  • Loading branch information
Ashley Enstad authored and Commit Bot committed Feb 8, 2018
1 parent 4cbd9a5 commit 96d6d3f
Show file tree
Hide file tree
Showing 8 changed files with 1,228 additions and 202 deletions.
71 changes: 5 additions & 66 deletions testing/buildbot/chromium.perf.fyi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,70 +462,6 @@
},
"One Buildbot Step Test Builder": {
"isolated_scripts": [
{
"args": [
"dummy_benchmark.histogram_benchmark_1",
"-v",
"--output-format=histograms",
"--output-format=json-test-results",
"--xvfb",
"--browser=reference"
],
"isolate_name": "telemetry_perf_tests_experimental",
"merge": {
"args": [],
"script": "//tools/perf/upload_perf_results.py"
},
"name": "benchmark1 dummy_benchmark.histogram_benchmark_1",
"override_compile_targets": [
"telemetry_perf_tests_experimental"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi"
}
],
"expiration": 36000,
"hard_timeout": 10800,
"ignore_task_failure": false,
"io_timeout": 3600
}
},
{
"args": [
"dummy_benchmark.stable_benchmark_1",
"-v",
"--output-format=histograms",
"--output-format=json-test-results",
"--xvfb",
"--browser=reference"
],
"isolate_name": "telemetry_perf_tests_experimental",
"merge": {
"args": [],
"script": "//tools/perf/upload_perf_results.py"
},
"name": "benchmark2 dummy_benchmark.stable_benchmark_1",
"override_compile_targets": [
"telemetry_perf_tests_experimental"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi"
}
],
"expiration": 36000,
"hard_timeout": 10800,
"ignore_task_failure": false,
"io_timeout": 3600
}
},
{
"args": [
"-v",
Expand All @@ -536,8 +472,11 @@
],
"isolate_name": "performance_test_suite",
"merge": {
"args": [],
"script": "//tools/perf/upload_perf_results.py"
"args": [
"--configuration-name",
"buildbot-test"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "performance_test_suite",
"override_compile_targets": [
Expand Down
8 changes: 0 additions & 8 deletions testing/buildbot/gn_isolate_map.pyl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,14 +988,6 @@
"../../tools/perf/run_benchmark",
],
},
"telemetry_perf_tests_experimental": {
"label": "//chrome/test:telemetry_perf_tests_experimental",
"type": "script",
"script": "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
"args": [
"../../tools/perf/run_benchmark",
],
},
"performance_test_suite": {
"label": "//chrome/test:performance_test_suite",
"type": "script",
Expand Down
78 changes: 7 additions & 71 deletions tools/perf/chromium.perf.fyi.extras.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,72 +275,6 @@
},
"One Buildbot Step Test Builder": {
"isolated_scripts": [
{
"args": [
"dummy_benchmark.histogram_benchmark_1",
"-v",
"--output-format=histograms",
"--output-format=json-test-results",
"--xvfb",
"--browser=reference"
],
"isolate_name": "telemetry_perf_tests_experimental",
"name": "benchmark1 dummy_benchmark.histogram_benchmark_1",
"override_compile_targets": [
"telemetry_perf_tests_experimental"
],
"merge": {
"args": [
],
"script": "//tools/perf/upload_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi"
}
],
"expiration": 36000,
"hard_timeout": 10800,
"ignore_task_failure": false,
"io_timeout": 3600
}
},
{
"args": [
"dummy_benchmark.stable_benchmark_1",
"-v",
"--output-format=histograms",
"--output-format=json-test-results",
"--xvfb",
"--browser=reference"
],
"isolate_name": "telemetry_perf_tests_experimental",
"name": "benchmark2 dummy_benchmark.stable_benchmark_1",
"override_compile_targets": [
"telemetry_perf_tests_experimental"
],
"merge": {
"args": [
],
"script": "//tools/perf/upload_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi"
}
],
"expiration": 36000,
"hard_timeout": 10800,
"ignore_task_failure": false,
"io_timeout": 3600
}
},
{
"args": [
"-v",
Expand All @@ -356,14 +290,16 @@
],
"merge": {
"args": [
"--configuration-name",
"buildbot-test"
],
"script": "//tools/perf/upload_perf_results.py"
"script": "//tools/perf/process_perf_results.py"
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"id\": \"swarm846-c4\", \"pool\": \"Chrome-perf-fyi\"}, {\"id\": \"swarm847-c4\", \"pool\": \"Chrome-perf-fyi\"}]"
],
"--multiple-trigger-configs",
"[{\"id\": \"swarm846-c4\", \"pool\": \"Chrome-perf-fyi\"}, {\"id\": \"swarm847-c4\", \"pool\": \"Chrome-perf-fyi\"}]"
],
"script": "//testing/trigger_scripts/perf_device_trigger.py"
},
"swarming": {
Expand All @@ -373,7 +309,7 @@
"pool": "Chrome-perf-fyi"
}
],
"shards": 2,
"shards": 2,
"expiration": 36000,
"hard_timeout": 10800,
"ignore_task_failure": false,
Expand Down
Loading

0 comments on commit 96d6d3f

Please sign in to comment.