Add swarming_run_shim.py to run swarming tasks as annotated tasks.

scripts/master/factory/swarm_factory.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility class to build the Swarm master BuildFactory's.
 
 Based on chromium_factory.py and adds chromium-on-swarm-specific steps.
 
 Common usage:
 - For a split builder&tester configuration, use:
@@ skipping 32 matching lines @@
     # size of the executables to map.
     SwarmTest('base_unittests', 1),
     SwarmTest('net_unittests', 1),
     SwarmTest('unit_tests', 2),
     SwarmTest('interactive_ui_tests', 3),
     SwarmTest('sync_integration_tests', 4),
     SwarmTest('browser_tests', 5),
 ]
 
 
-def SwarmTestBuilder(swarm_server, isolation_outdir, tests):
-  """Create a basic swarm builder that runs tests via Swarm.
+def SwarmTestBuilder(swarm_server, isolation_server, tests):
+  """Create a basic swarm builder that runs tests via Swarming.
 
-  To clarify, this 'buildbot builder' doesn't compile.
+  To clarify, this 'buildbot builder' doesn't compile, doesn't have a checkout,
+  it just triggers a job and gets results.
   """
-  valid_tests = set(s.test_name for s in SWARM_TESTS)
-  assert not any(t not in valid_tests for t in tests)
-
   # No need of a window manager when only retrieving results.
   f = build_factory.BuildFactory()
 
   # Some of the scripts require a build_dir to be set, so set it even
   # if the machine might not have it (It shouldn't matter what this is).
   build_dir = 'chrome'
 
   swarm_command_obj = swarm_commands.SwarmCommands(factory=f,
                                                    build_dir=build_dir)
   # Update scripts before triggering so the tasks are triggered and collected
   # with the same version of the scripts.
   swarm_command_obj.AddUpdateScriptStep()
 
   # Checks out the scripts at the right revision so the trigger can happen.
   swarm_command_obj.AddUpdateSwarmClientStep()
 
-  # Send the swarm tests to the swarm server.
-  swarm_tests = [s for s in SWARM_TESTS if s.test_name in tests]
-  swarm_command_obj.AddTriggerSwarmTestStep(
-      swarm_server=swarm_server,
-      isolation_outdir=isolation_outdir,
-      tests=swarm_tests,
-      doStepIf=swarm_commands.TestStepFilterTriggerSwarm)
-
-  # Collect the results
-  for swarm_test in swarm_tests:
-    swarm_command_obj.AddGetSwarmTestResultStep(
-        swarm_server, swarm_test.test_name, swarm_test.shards)
-
+  swarm_command_obj.AddSwarmingStep(swarm_server, isolation_server)
   return f
 
 
 class SwarmFactory(chromium_factory.ChromiumFactory):
-  """Runs swarm tests in a single build, contrary to ChromiumFactory which can
-  trigger swarm jobs but doesn't look for results.
+  """Runs swarming tests in a single build, contrary to ChromiumFactory which
+  can trigger swarming jobs but doesn't look for results.
 
   This factory does both, which is usually a waste of resource, you don't want
   to waste a powerful slave sitting idle, waiting for swarm results. Used on
   chromium.swarm canary for simplicity purpose.
   """
   def SwarmFactory(
       self, tests, options, factory_properties, swarm_server, isolate_server):
     """Only Release is supported for now.
 
     Caller must not reuse factory_properties since it is modified in-place.
     """
-    valid_tests = set(s.test_name for s in SWARM_TESTS)
-    assert not (set(tests) - set(valid_tests))
     target = 'Release'
-
     factory_properties.setdefault('gclient_env', {})
     factory_properties['gclient_env'].setdefault('GYP_DEFINES', '')
     factory_properties['gclient_env']['GYP_DEFINES'] += (
         ' test_isolation_mode=hashtable test_isolation_outdir=' +
         isolate_server)
 
     # Do not pass the tests to the ChromiumFactory, they'll be processed below.
     f = self.ChromiumFactory(target=target,
                              options=options,
                              factory_properties=factory_properties)
 
     swarm_command_obj = swarm_commands.SwarmCommands(
         f,
         target,
         self._build_dir,
         self._target_platform)
 
     swarm_command_obj.AddGenerateIsolatedHashesStep(tests=tests, doStepIf=True)
-
-    # Send of all the test requests as a single step.
-    swarm_tests = [s for s in SWARM_TESTS if s.test_name in tests]
-    swarm_command_obj.AddTriggerSwarmTestStep(swarm_server, isolate_server,
-                                              swarm_tests, True)
-
-    # Each test has its output returned as its own step.
-    for test in swarm_tests:
-      swarm_command_obj.AddGetSwarmTestResultStep(
-          swarm_server, test.test_name, test.shards)
-
+    swarm_command_obj.AddSwarmingStep(swarm_server, isolate_server)
     return f
 
 
 class IsolatedFactory(chromium_factory.ChromiumFactory):
   """Run all the tests in isolated mode, without using swarm at all.
 
   It's a normal BuilderTester but runs all its tests in isolated mode
   inconditionally.
   """
   def IsolatedFactory(self, tests, options, factory_properties):
@@ skipping 21 matching lines @@
 
     # Reorder the tests by the order specified in SWARM_TESTS. E.g. the slower
     # tests are retrieved last.
     for swarm_test in SWARM_TESTS:
       if swarm_test.test_name in tests:
         tests.remove(swarm_test.test_name)
         swarm_command_obj.AddIsolateTest(swarm_test.test_name)
 
     assert not tests
     return f