Create proper wrapper scripts to decouple from swarm_client.

scripts/master/factory/swarm_commands.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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds swarm-specific commands."""
 
-from buildbot.process.properties import WithProperties
 from buildbot.steps import shell, source
 from twisted.python import log
 
 from master import chromium_step
 from master.factory import commands
 
 from common import chromium_utils
 
 import config
 
@@ skipping 61 matching lines @@
 
     'swarm_hashes' is already related to GetSwarmTests().
     """
     # Only used for pass gtest filters specified by the user via 'testfilter'.
     swarm_tests = commands.GetSwarmTests(self)
     # The 'swarm_hashes' build property has been set by the
     # CalculateIsolatedSha1s build step. It will have all the steps that can be
     # triggered. This implicitly takes account 'testfilter'.
     swarm_tests_hash_mapping = commands.GetProp(self, 'swarm_hashes', {})
 
+    # TODO(maruel): Move more logic out into
+    # scripts/slave/swarming/trigger_swarm_shim.py.
     command = self.command[:]
     for swarm_test in self.tests:
       if swarm_tests_hash_mapping.get(swarm_test.test_name):
         command.extend(
             [
-              '--run_from_hash',
+              '--task',
               swarm_tests_hash_mapping[swarm_test.test_name],
               swarm_test.test_name,
               '%d' % swarm_test.shards,
               # '*' is a special value to mean no filter. This is used so '' is
               # not used, as '' may be misinterpreted by the shell, especially
               # on Windows.
               swarm_tests.get(swarm_test.test_name) or '*',
             ])
       else:
         log.msg('Given a swarm test, %s, that has no matching hash' %
                 swarm_test.test_name)
 
     self.setCommand(command)
     shell.ShellCommand.start(self)
 
 
 class SwarmCommands(commands.FactoryCommands):
   """Encapsulates methods to add swarm commands to a buildbot factory"""
   def __init__(self, *args, **kwargs):
     super(SwarmCommands, self).__init__(*args, **kwargs)
     self._swarming_client_dir = self.PathJoin('src', 'tools', 'swarming_client')
 
   def AddTriggerSwarmTestStep(self, swarm_server, isolation_outdir, tests,
                               doStepIf):
     assert all(t.__class__.__name__ == 'SwarmTest' for t in tests)
-    script_path = self.PathJoin(
-        self._swarming_client_dir, 'swarm_trigger_step.py')
-
-    swarm_request_name_prefix = WithProperties('%s-%s-',
-                                               'buildername:-None',
-                                               'buildnumber:-None')
-
     command = [
       self._python,
-      script_path,
-      '-o', WithProperties('%s', 'target_os:-%s' % self._target_platform),
-      '-u', swarm_server,
-      '-t', swarm_request_name_prefix,
-      '-d', isolation_outdir,
+      self.PathJoin(self._script_dir, 'swarming', 'trigger_swarm_shim.py'),
+      '--swarming', swarm_server,
+      '--isolate-server', isolation_outdir,
     ]
+    command = self.AddBuildProperties(command)
     assert all(i for i in command), command
     self._factory.addStep(
         SwarmShellForTriggeringTests,
         name='swarm_trigger_tests',
         description='Trigger swarm steps',
         command=command,
         tests=tests,
         doStepIf=doStepIf)
 
   def AddGetSwarmTestStep(self, swarm_server, test_name, num_shards):
     """Adds the step to retrieve the Swarm job results asynchronously."""
     # TODO(maruel): assert test_name.endswith('_swarm') once swarm retrieve
     # results steps have _swarm suffix.
-    script_path = self.PathJoin(self._script_dir, 'get_swarm_results.py')
-
-    swarm_request_name = WithProperties('%s-%s-' + test_name,
-                                        'buildername:-None',
-                                        'buildnumber:-None')
-
-    args = ['-u', swarm_server, '-s', '%d' % num_shards, swarm_request_name]
-    wrapper_args = [
-      '--no-xvfb', '--annotate=gtest', '--test-type=%s' % test_name,
+    command = [
+      self._python,
+      self.PathJoin(self._script_dir, 'swarming', 'get_swarm_results_shim.py'),
+      '--swarming', swarm_server,
+      '--shards', '%d' % num_shards,
+      test_name,
     ]
-
-    command = self.GetPythonTestCommand(script_path, arg_list=args,
-                                        wrapper_args=wrapper_args)
+    command = self.AddBuildProperties(command)
 
     # Swarm handles the timeouts due to no ouput being produced for 10 minutes,
     # but we don't have access to the output until the whole test is done, which
     # may take more than 10 minutes, so we increase the buildbot timeout.
     timeout = 2 * 60 * 60
-
-    self.AddTestStep(chromium_step.AnnotatedCommand,
-                     test_name,
-                     command,
-                     timeout=timeout,
-                     do_step_if=TestStepFilterRetrieveSwarmResult)
+    self._factory.addStep(
+        shell.ShellCommand,
+        name=test_name,
+        description='%s Swarming' % test_name,
+        command=command,
+        timeout=timeout,
+        doStepIf=TestStepFilterRetrieveSwarmResult)
 
   def AddUpdateSwarmClientStep(self):
     """Checks out swarming_client so it can be used at the right revision."""
     def doSwarmingStepIf(b):
       return bool(commands.GetProp(b, 'use_swarming_client_revision', None))
     def doSwarmStepIf(b):
       return not doSwarmingStepIf(b)
 
     # Emulate the path of a src/DEPS checkout, to keep things simpler.
     relpath = 'build/src/tools/swarming_client'
@@ skipping 40 matching lines @@
 
     command = [self._python, script_path, '--drive', drive,
                '--network_path', network_path]
 
     self._factory.addStep(
         shell.ShellCommand,
         name='setup_windows_network_storage',
         description='setup_windows_network_storage',
         descriptionDone='setup_windows_network_storage',
         command=command)