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
@@ skipping 71 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', {})
 
     command = self.command[:]
+    requester = commands.GetProp(self, 'requester', None)
+    # 'ci' means Continuous Integration and it's jobs that are meant to test
+    # code that has just been committed but yet tested. That's what most people
+    # call 'the waterfall' or the 'main master'.
+    tasktype = 'ci'
+    if requester == 'commit-bot@chromium.org':
+      tasktype = 'cq'
+    elif requester or commands.GetProp(self, 'testfilter', None):
+      tasktype = 'tryjob'
+    # TODO(maruel): Determine difference between CI and FYI masters.
+    command.extend(('--type', tasktype))
+
     for swarm_test in self.tests:
       if swarm_tests_hash_mapping.get(swarm_test.test_name):
         command.extend(
             [
               '--run_from_hash',
               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
@@ skipping 10 matching lines @@
 
 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')
+    swarm_request_name_prefix = WithProperties(

[Isaac (away), 2013/08/20 22:22:33]

While this is OK, the preferred style is probably to pass the entire
build_properties map and let the slave script parse and decide what it needs.

+        '%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, 'trigger_swarm.py'),
+      '--os', WithProperties('%s', 'target_os:-%s' % self._target_platform),
+      '--swarming', swarm_server,
+      '--task-prefix', swarm_request_name_prefix,
+      '--isolate-server', isolation_outdir,
     ]
     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]
+    args = [
+        '--swarming', swarm_server,
+        '--shards', '%d' % num_shards,
+        swarm_request_name,
+    ]
     wrapper_args = [
       '--no-xvfb', '--annotate=gtest', '--test-type=%s' % test_name,
     ]
 
     command = self.GetPythonTestCommand(script_path, arg_list=args,
                                         wrapper_args=wrapper_args)
 
     # 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.
@@ skipping 57 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)