trigger_scripts: do not use use_swarming_go

This is specified by default after https://crrev.com/c/2626865

Bug: 1127205
Change-Id: I6d1b64ab6c68283196cc5614bfd26a2e03b025be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627651
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843977}

testing/trigger_scripts/base_test_triggerer.py

@@ -306,10 +306,7 @@ class BaseTestTriggerer(object):
                                         suffix='.json')
         args_to_pass = self.modify_args(filtered_remaining_args, bot_index,
                                         shard_index, args.shards, json_temp)
-        if args.use_swarming_go:
-          ret = self.run_swarming_go(args_to_pass, verbose)
-        else:
-          ret = self.run_swarming(args_to_pass, verbose)
+        ret = self.run_swarming_go(args_to_pass, verbose)
         if ret:
           sys.stderr.write('Failed to trigger a task, aborting\n')
           return ret
@@ -324,11 +321,9 @@ class BaseTestTriggerer(object):
           # which will be handled specially.
           merged_json['tasks'] = {}
         tasks = result_json['tasks']
-        if args.use_swarming_go:
-          # TODO(crbug.com/1127205): remove this
-          tasks = {
-            task['request']['task_id']: task['request'] for task in tasks
-          }
+        tasks = {
+          task['request']['task_id']: task['request'] for task in tasks
+        }
         for k, v in tasks.items():
           v['shard_index'] = shard_index
           merged_json['tasks'][k + ':%d:%d' % (shard_index, args.shards)] = v
@@ -361,6 +356,7 @@ class BaseTestTriggerer(object):
 
   @staticmethod
   def add_use_swarming_go_arg(parser):
+    # TODO(crbug.com/1127205): remove this.
     parser.add_argument(
         '--use-swarming-go',
         default=False,

testing/trigger_scripts/chromeos_device_trigger.py

@@ -129,9 +129,7 @@ def main():
   ])
   new_args += additional_args[1:]
 
-  if args.use_swarming_go:
-    return triggerer.run_swarming_go(new_args, True)
-  return triggerer.run_swarming(new_args, True)
+  return triggerer.run_swarming_go(new_args, True)
 
 
 if __name__ == '__main__':

testing/trigger_scripts/perf_device_trigger_unittest.py

@@ -16,7 +16,6 @@ class Args(object):
     self.dump_json = ''
     self.multiple_trigger_configs = None
     self.multiple_dimension_script_verbose = False
-    self.use_swarming_go = False
 
 
 class FakeTriggerer(perf_device_trigger.PerfDeviceTriggerer):
@@ -61,13 +60,11 @@ class UnitTest(unittest.TestCase):
   def setup_and_trigger(self,
                         previous_task_assignment_map,
                         alive_bots,
-                        dead_bots,
-                        use_swarming_go=False):
+                        dead_bots):
     args = Args()
     args.shards = len(previous_task_assignment_map)
     args.dump_json = 'output.json'
     args.multiple_dimension_script_verbose = True
-    args.use_swarming_go = use_swarming_go
     swarming_args = [
         'trigger',
         '--swarming',
@@ -86,14 +83,14 @@ class UnitTest(unittest.TestCase):
 
     triggerer = FakeTriggerer(args, swarming_args,
         self.get_files(args.shards, previous_task_assignment_map,
-                       alive_bots, dead_bots, use_swarming_go=use_swarming_go))
+                       alive_bots, dead_bots))
     triggerer.trigger_tasks(
       args,
       swarming_args)
     return triggerer
 
   def get_files(self, num_shards, previous_task_assignment_map,
-                alive_bots, dead_bots, use_swarming_go):
+                alive_bots, dead_bots):
     files = {}
     file_index = 0
     files['base_trigger_dimensions%d.json' % file_index] = (
@@ -113,29 +110,13 @@ class UnitTest(unittest.TestCase):
           self.generate_last_task_to_shard_query_response(i, bot_id))
       file_index = file_index + 1
     for i in xrange(num_shards):
-      if use_swarming_go:
-        task = {
-          'tasks': [{
-            'request': {
-              'task_id': 'f%d' % i,
-            },
-          }],
-        }
-      else:
-        task = {
-          'base_task_name': 'webgl_conformance_tests',
+      task = {
+        'tasks': [{
           'request': {
-            'expiration_secs': 3600,
-            'properties': {
-              'execution_timeout_secs': 3600,
-            },
-          },
-          'tasks': {
-            'webgl_conformance_tests on NVIDIA GPU on Windows': {
-              'task_id': 'f%d' % i,
-            },
+            'task_id': 'f%d' % i,
           },
-        }
+        }],
+      }
       files['base_trigger_dimensions%d.json' % file_index] = task
       file_index = file_index + 1
     return files
@@ -313,8 +294,7 @@ class UnitTest(unittest.TestCase):
     triggerer = self.setup_and_trigger(
         previous_task_assignment_map={0: 'build1'},
         alive_bots=['build1'],
-        dead_bots=[],
-        use_swarming_go=True)
+        dead_bots=[])
 
     self.assertEquals(triggerer._triggered_with_swarming_go, 1)