Commit 1a252030 authored by Stephen Martinis's avatar Stephen Martinis Committed by Commit Bot

Revert "//tools/perf: Use trigger script in OBBS tester"

This reverts commit 1d3fc0ad.

Reason for revert: Broken for now, will reland with some fixes. ashleymarie@ might do the reland.

Original change's description:
> //tools/perf: Use trigger script in OBBS tester
> 
> Change-Id: Ie024ff5713fde047803601391629caff3f40950b
> Reviewed-on: https://chromium-review.googlesource.com/722067
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Reviewed-by: Ned Nguyen <nednguyen@google.com>
> Cr-Commit-Position: refs/heads/master@{#510581}

TBR=nednguyen@google.com,martiniss@chromium.org,eyaich@chromium.org,ashleymarie@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I4de924b07b2420e6a9f1fba6095e993292354595
Reviewed-on: https://chromium-review.googlesource.com/734990Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512597}
parent d260b6a2
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
"--bot",
"swarm823-c4",
"--builder", "--builder",
"One Buildbot Step Test Builder", "One Buildbot Step Test Builder",
"-v", "-v",
...@@ -100,6 +102,7 @@ ...@@ -100,6 +102,7 @@
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
{ {
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi" "pool": "Chrome-perf-fyi"
} }
], ],
...@@ -107,17 +110,6 @@ ...@@ -107,17 +110,6 @@
"hard_timeout": 10800, "hard_timeout": 10800,
"ignore_task_failure": false, "ignore_task_failure": false,
"io_timeout": 3600 "io_timeout": 3600
},
"trigger_script": {
"args": [
"--bot-id",
"swarm823-c4",
"--bot-id",
"swarm846-c4",
"--bot-id",
"swarm847-c4"
],
"script": "//tools/perf/perf_device_trigger.py"
} }
} }
] ]
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
"--bot", "swarm823-c4",
"--builder", "One Buildbot Step Test Builder", "--builder", "One Buildbot Step Test Builder",
"-v", "-v",
"--output-format=histograms", "--output-format=histograms",
...@@ -101,6 +102,7 @@ ...@@ -101,6 +102,7 @@
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
{ {
"id": "swarm823-c4",
"pool": "Chrome-perf-fyi" "pool": "Chrome-perf-fyi"
} }
], ],
...@@ -108,14 +110,6 @@ ...@@ -108,14 +110,6 @@
"hard_timeout": 10800, "hard_timeout": 10800,
"ignore_task_failure": false, "ignore_task_failure": false,
"io_timeout": 3600 "io_timeout": 3600
},
"trigger_script": {
"script": "//tools/perf/perf_device_trigger.py",
"args": [
"--bot-id", "swarm823-c4",
"--bot-id", "swarm846-c4",
"--bot-id", "swarm847-c4"
]
} }
} }
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment