Add a new script bb_host_steps.py which handles all host side steps.

build/android/buildbot/bb_utils.py

+# Copyright (c) 2013 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.
+
+import json
+import optparse
+import os
+import pipes
+import subprocess
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+from pylib import buildbot_report
+from pylib import constants
+
+
+TESTING = 'BUILDBOT_TESTING' in os.environ
+
+BB_BUILD_DIR = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
+    os.pardir, os.pardir, os.pardir, os.pardir))
+
+GOMA_DIR = os.path.join(BB_BUILD_DIR, 'goma')

[Isaac (away), 2013/06/05 03:03:07]

remove this variable.

[Siva Chandra, 2013/06/05 21:04:28]

Done.

+
+
+class BBOptionParser(optparse.OptionParser):
+  def Error(self, msg):
+    self.print_help()
+    print >> sys.stderr, '\nERROR:', msg
+    return 1
+
+
+def SpawnCmd(command):
+  """Spawn a process without waiting for termination."""
+  print '>', ' '.join(map(pipes.quote, command))
+  sys.stdout.flush()
+  if TESTING:
+    class MockPopen(object):
+      @staticmethod
+      def wait():
+        return 0
+    return MockPopen()
+
+  return subprocess.Popen(command, cwd=constants.CHROME_DIR)
+
+
+def RunCmd(command, flunk_on_failure=True, halt_on_failure=False,
+           retcode_callback=None):
+  """Run a command relative to the chrome source root."""
+  code = SpawnCmd(command).wait()
+  print '<', ' '.join(map(pipes.quote, command))
+  if retcode_callback:
+    code, flunk_on_failure, halt_on_failure = retcode_callback(code)

[Isaac (away), 2013/06/05 03:03:07]

I don't think we need this callback  - can you pass a optional warning_code arg
(defaulting to 88) that specifies what code to not worry about instead?

[Siva Chandra, 2013/06/05 21:04:28]

Done.

+  if code != 0:
+    print 'ERROR: process exited with code %d' % code
+    if flunk_on_failure:
+      buildbot_report.PrintError()
+    else:
+      buildbot_report.PrintWarning()
+    # Allow steps to have both halting (i.e. 1) and non-halting exit codes.
+    if code != 0 and code != 88 and halt_on_failure:
+      raise OSError()
+  return code
+
+
+def ConvertJson(option, _, value, parser):
+  setattr(parser.values, option.dest, json.loads(value))
+
+
+def GetParser():
+  parser = BBOptionParser()

[Isaac (away), 2013/06/05 03:03:07]

Actually, I think it would be OK to use a regular OptionParser here.  Looking at
our usage, I think sys.exit() could be OK since bb_device_tests is spawned as a
separate process.

[Siva Chandra, 2013/06/05 21:04:28]

Done.

+  parser.add_option('--build-properties', action='callback',
+                    callback=ConvertJson, type='string', default={},
+                    help='build properties in JSON format')
+  parser.add_option('--factory-properties', action='callback',
+                    callback=ConvertJson, type='string', default={},
+                    help='factory properties in JSON format')
+  parser.add_option('--slave-properties', action='callback',
+                    callback=ConvertJson, type='string', default={},
+                    help='Properties set by slave script in JSON format')
+
+  return parser