Add Swarming task for downloading Android SDK on Skia bots

scripts/slave/recipes/skia/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
 
@@ skipping 147 matching lines @@
       'scripts', 'slave', 'recipes', 'skia')
   api.skia_swarming.create_isolated_gen_json(
       skia_recipes_dir.join('swarm_recipe.isolate'),
       skia_recipes_dir,
       'linux',
       'isolate_recipes',
       {})
   return api.skia_swarming.batcharchive(['isolate_recipes'])[0][1]
 
 
+def isolate_gsutil(api):
+  """Isolate gsutil from the depot_tools checkout."""
+  skia_recipes_dir = api.path['build'].join(
+      'scripts', 'slave', 'recipes', 'skia')
+  api.skia_swarming.create_isolated_gen_json(
+      skia_recipes_dir.join('gsutil.isolate'),
+      skia_recipes_dir,
+      'linux',
+      'isolate_gsutil',
+      {})
+  return api.skia_swarming.batcharchive(['isolate_gsutil'])[0][1]
+
+
 def trigger_task(api, task_name, builder, master, slave, buildnumber,
                  builder_spec, got_revision, infrabots_dir, idempotent=False,
                  store_output=True, extra_isolate_hashes=None, expiration=None,
                  hard_timeout=None, io_timeout=None):
   """Trigger the given bot to run as a Swarming task."""
   # TODO(borenet): We're using Swarming directly to run the recipe through
   # recipes.py. Once it's possible to track the state of a Buildbucket build,
   # we should switch to use the trigger recipe module instead.
 
   properties = {
@@ skipping 329 matching lines @@
   api.gsutil.upload(
       name='upload line-by-line coverage data',
       source=dst_lbl_file,
       bucket='skia-infra',
       dest='/'.join(('coverage-json-v1', gs_json_path,
                      dst_lbl_file_basename)),
       env={'AWS_CREDENTIAL_FILE': None, 'BOTO_CONFIG': None},
   )
 
 
+def download_asset(api, infrabots_dir, depot_tools_hash, asset):
+  """Trigger a swarming task to download and isolate the given asset."""
+  return api.skia_swarming.isolate_and_trigger_task(
+      infrabots_dir.join('download_asset.isolate'),
+      api.path['slave_build'],
+      'download_%s' % asset,
+      {'ASSET': asset, 'GSUTIL': '../../../../../depot_tools/gsutil.py'},
+      {'pool': 'Skia', 'os': 'Ubuntu'},
+      extra_isolate_hashes=[depot_tools_hash],
+      idempotent=True,
+      isolate_blacklist=['.git', 'out', '*.pyc'],
+      store_output=False,
+  )
+
+
+def collect_hashes(api, tasks):
+  """Collect the isolated hash for each swarming task."""
+  return [
+      api.skia_swarming.collect_swarming_task_isolate_hash(t) for t in tasks]
+
+
 def RunSteps(api):
   got_revision = checkout_steps(api)
   builder_spec = api.skia.get_builder_spec(api.path['checkout'],
                                            api.properties['buildername'])
   builder_cfg = builder_spec['builder_cfg']
   infrabots_dir = api.path['checkout'].join('infra', 'bots')
 
   api.skia_swarming.setup(
       api.path['checkout'].join('infra', 'bots', 'tools', 'luci-go'),
       swarming_rev='')
 
   # Run gsutil.py to ensure that it's installed.
   api.gsutil(['help'])
 
   recipes_hash = isolate_recipes(api)
   extra_hashes = [recipes_hash]
 
+  # Some tasks only need depot_tools.
+  depot_tools_hash = isolate_gsutil(api)
+
+  # Get ready to compile.
+  compile_deps = []
+  extra_compile_hashes = [recipes_hash]
+
   # Android bots require an SDK.
   if 'Android' in api.properties['buildername']:
-    test_data = 'a27a70d73b85191b9e671ff2a44547c3f7cc15ee'
-    hash_file = infrabots_dir.join('android_sdk_hash')
-    # try/except as a temporary measure to prevent breakages for backfills
-    # and branches.
-    try:
-      h = api.skia._readfile(hash_file,
-                             name='Read android_sdk_hash',
-                             test_data=test_data).rstrip()
-    except api.step.StepFailure:
-      # Just fall back on the original hash.
-      h = 'a27a70d73b85191b9e671ff2a44547c3f7cc15ee'
-    extra_hashes.append(h)
+    if api.path.exists(infrabots_dir.join('assets', 'android_sdk')):
+      compile_deps.append(download_asset(
+          api, infrabots_dir, depot_tools_hash, 'android_sdk'))
+    else:
+      # TODO(borenet): Remove this legacy method after 7/1/2016.

[rmistry, 2016/06/16 12:34:20]

Why after 7/1/2016?

[borenet, 2016/06/16 19:25:37]

Roughly two weeks from now.  I like the idea of attaching a date so that anyone
who comes across this comment in, say, two months, can notify me that I've
forgotten about it :)

+      test_data = 'a27a70d73b85191b9e671ff2a44547c3f7cc15ee'
+      hash_file = infrabots_dir.join('android_sdk_hash')
+      # try/except as a temporary measure to prevent breakages for backfills
+      # and branches.
+      try:
+        h = api.skia._readfile(hash_file,
+                               name='Read android_sdk_hash',
+                               test_data=test_data).rstrip()
+      except api.step.StepFailure:
+        # Just fall back on the original hash.
+        h = 'a27a70d73b85191b9e671ff2a44547c3f7cc15ee'
+      extra_hashes.append(h)
+      extra_compile_hashes.append(h)
 
+  extra_compile_hashes.extend(collect_hashes(api, compile_deps))
+
+  # Compile.
   do_compile_steps = builder_spec.get('do_compile_steps', True)
-  compile_hash = None
   if do_compile_steps:
-    compile_hash = compile_steps_swarm(api, builder_spec, got_revision,
-                                       infrabots_dir, extra_hashes)
+    extra_hashes.append(compile_steps_swarm(
+        api, builder_spec, got_revision, infrabots_dir, extra_compile_hashes))
 
   if builder_cfg['role'] == 'Housekeeper':
     housekeeper_swarm(api, builder_spec, got_revision, infrabots_dir,
                       extra_hashes)
     return
 
+  # Get ready to test/perf.
   do_test_steps = builder_spec['do_test_steps']
   do_perf_steps = builder_spec['do_perf_steps']
 
   if not (do_test_steps or do_perf_steps):
     return
 
-  if compile_hash:
-    extra_hashes.append(compile_hash)
-
   api.skia.download_skps(api.path['slave_build'].join('tmp'),
                          api.path['slave_build'].join('skps'),
                          False)
   api.skia.download_images(api.path['slave_build'].join('tmp'),
                            api.path['slave_build'].join('images'),
                            False)
 
   test_task = None
   perf_task = None
   if do_test_steps:
     test_task = test_steps_trigger(api, builder_spec, got_revision,
                                    infrabots_dir, extra_hashes)
   if do_perf_steps:
     perf_task = perf_steps_trigger(api, builder_spec, got_revision,
                                    infrabots_dir, extra_hashes)
   is_trybot = builder_cfg['is_trybot']
   if test_task:
     test_steps_collect(api, test_task, builder_spec['upload_dm_results'],
                        got_revision, is_trybot, builder_cfg)
   if perf_task:
     perf_steps_collect(api, perf_task, builder_spec['upload_perf_results'],
                        got_revision, is_trybot)
 
 
-def test_for_bot(api, builder, mastername, slavename, testname=None):
+def test_for_bot(api, builder, mastername, slavename, testname=None,
+                 legacy_android_sdk=False):
   """Generate a test for the given bot."""
   testname = testname or builder
   test = (
     api.test(testname) +
     api.properties(buildername=builder,
                    mastername=mastername,
                    slavename=slavename,
                    buildnumber=5,
                    revision='abc123') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
   if 'Trybot' in builder:
     test += api.properties(issue=500,
                            patchset=1,
                            rietveld='https://codereview.chromium.org')
+  if 'Android' in builder:
+    if not legacy_android_sdk:
+      test += api.path.exists(api.path['slave_build'].join(
+          'skia', 'infra', 'bots', 'assets', 'android_sdk'))
+      test += api.step_data(
+          'upload new .isolated file for download_android_sdk',
+          stdout=api.raw_io.output('def456 XYZ.isolated'))
   if 'Coverage' not in builder:
     test += api.step_data(
         'upload new .isolated file for compile_skia',
         stdout=api.raw_io.output('def456 XYZ.isolated'))
   if 'Test' in builder:
     test += api.step_data(
         'upload new .isolated file for test_skia',
         stdout=api.raw_io.output('def456 XYZ.isolated'))
   if ('Test' in builder and 'Debug' in builder) or 'Perf' in builder or (
       'Valgrind' in builder and 'Test' in builder):
@@ skipping 30 matching lines @@
   test += api.properties(test_downloaded_skp_version='999')
   test += api.path.exists(
       api.path['slave_build'].join('skia'),
       api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
   )
   yield test
 
   builder = 'Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan'
   master = 'client.skia.compile'
   slave = 'skiabot-linux-compile-000'
-  test = test_for_bot(api, builder, master, slave, 'Missing_android_sdk_hash')
+  test = test_for_bot(api, builder, master, slave, 'legacy_android_sdk',
+                      legacy_android_sdk=True)
+  test += api.step_data('Read android_sdk_hash',
+                        stdout=api.raw_io.output('<android_sdk_hash>'))
+  yield test
+
+  test = test_for_bot(api, builder, master, slave, 'Missing_android_sdk_hash',
+                      legacy_android_sdk=True)
   test += api.step_data('Read android_sdk_hash', retcode=1)
   yield test