//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}

testing/buildbot/chromium.perf.fyi.json

@@ -59,8 +59,6 @@
     "isolated_scripts": [
       {
         "args": [
-          "--bot",
-          "swarm823-c4",
           "--builder",
           "One Buildbot Step Test Builder",
           "-v",
@@ -78,7 +76,6 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "id": "swarm823-c4",
               "pool": "Chrome-perf-fyi"
             }
           ],
@@ -86,6 +83,17 @@
           "hard_timeout": 10800,
           "ignore_task_failure": false,
           "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"
         }
       }
     ]

tools/perf/chromium.perf.fyi.extras.json

@@ -61,7 +61,6 @@
     "isolated_scripts": [
       {
         "args": [
-          "--bot", "swarm823-c4",
           "--builder", "One Buildbot Step Test Builder",
           "-v",
           "--output-format=histograms",
@@ -78,7 +77,6 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "id": "swarm823-c4",
               "pool": "Chrome-perf-fyi"
             }
           ],
@@ -86,6 +84,14 @@
           "hard_timeout": 10800,
           "ignore_task_failure": false,
           "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"
+          ]
         }
       }
     ]

tools/perf/perf_device_trigger.py

@@ -52,7 +52,7 @@ def modify_args(all_args, bot_id, temp_file):
 
   return all_args[:dash_ind] + [
       '--dump_json', temp_file, '--dimension', 'id', bot_id] + all_args[
-          dash_ind:] + ['--id', bot_id]
+          dash_ind:] + ['--bot', bot_id]
 
 
 def trigger_tasks(args, remaining):

tools/perf/perf_device_trigger_unittest.py

@@ -59,7 +59,7 @@ class PerfDeviceTriggerUnittest(unittest.TestCase):
               '/path/to/swarming.py', 'trigger',
               '--some', '--test',
               '--dimension', 'id', 'build1', '--',
-              'args', '--id', 'build1'])
+              'args', '--bot', 'build1'])
           finally:
             os.close(temp_fd)
             os.remove(json_temp)