Fixes for SwarmBucket bot

infra/bots/recipes/swarm_trigger.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import json
 
 
 DEPS = [
   'build/file',
   'build/gsutil',
   'depot_tools/depot_tools',
   'depot_tools/git',
   'depot_tools/tryserver',
+  'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
   'recipe_engine/time',
   'skia',
   'skia_swarming',
 ]
 
@@ skipping 180 matching lines @@
       expiration=expiration,
       hard_timeout=hard_timeout,
       io_timeout=io_timeout,
       cipd_packages=cipd_packages)
 
 
 def checkout_steps(api):
   """Run the steps to obtain a checkout of Skia."""
   # In this case, we're already running inside a checkout of Skia, so just
   # report the currently-checked-out commit.
-  checkout_path = api.path['root'].join('skia')
+  checkout_path = api.path['slave_build'].join('skia')
   got_revision = api.git(
       'rev-parse', 'HEAD', cwd=checkout_path,
       stdout=api.raw_io.output(),
       step_test_data=lambda: api.raw_io.test_api.stream_output('abc123\n'),
   ).stdout.rstrip()
   cmd = ['python', '-c', '"print \'%s\'"' % got_revision]
   res = api.step('got_revision', cmd=cmd)
   res.presentation.properties['got_revision'] = got_revision
   api.path['checkout'] = checkout_path
+
+  # Write a fake .gclient file if none exists. This is required by .isolates.
+  dot_gclient = api.path['slave_build'].join('.gclient')
+  if not api.path.exists(dot_gclient):
+    api.skia._writefile(dot_gclient, '')
+
   fix_filemodes(api, api.path['checkout'])
   return got_revision
 
 
 def housekeeper_swarm(api, builder_spec, got_revision, infrabots_dir,
                       extra_isolate_hashes):
   task = trigger_task(
       api,
       'housekeeper',
       api.properties['buildername'],
@@ skipping 307 matching lines @@
 def cipd_pkg(api, infrabots_dir, asset_name):
   """Find and return the CIPD package info for the given asset."""
   version_file = infrabots_dir.join('assets', asset_name, 'VERSION')
   version = api.skia._readfile(version_file,
                                name='read %s VERSION' % asset_name,
                                test_data='0').rstrip()
   version = 'version:%s' % version
   return (asset_name, 'skia/bots/%s' % asset_name, version)
 
 
+def print_properties(api):
+  """Dump out all properties for debugging purposes."""
+  props = {}
+  for k, v in api.properties.iteritems():
+    props[k] = v
+  api.python.inline(
+      'print properties',
+      '''
+import json
+import sys
+
+with open(sys.argv[1]) as f:
+  content = json.load(f)
+
+print json.dumps(content, indent=2)
+''',
+      args=[api.json.input(props)])
+
+
 def RunSteps(api):
+  # TODO(borenet): Remove this once SwarmBucket is working.
+  print_properties(api)
+
   got_revision = checkout_steps(api)
   infrabots_dir = api.path['checkout'].join('infra', 'bots')
   api.skia_swarming.setup(
       infrabots_dir.join('tools', 'luci-go'),
       swarming_rev='')
 
   # Run gsutil.py to ensure that it's installed.
   api.gsutil(['help'])
 
   extra_hashes = []
@@ skipping 113 matching lines @@
   test += api.path.exists(*paths)
 
   return test
 
 
 def GenTests(api):
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         yield test_for_bot(api, builder, mastername, slavename)