Revert of [Skia] Convert Sk Images to a CIPD package

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 543 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 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 RunSteps(api):
   got_revision = checkout_steps(api)
   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]
 
   # Get ready to compile.
   compile_cipd_deps = []
   extra_compile_hashes = [recipes_hash]
 
   infrabots_dir = api.path['checkout'].join('infra', 'bots')
   if 'Infra' in api.properties['buildername']:
     return infra_swarm(api, got_revision, infrabots_dir, extra_hashes)
 
   builder_spec = api.skia.get_builder_spec(api.path['checkout'],
                                            api.properties['buildername'])
   builder_cfg = builder_spec['builder_cfg']
 
   # Android bots require an SDK.
   if 'Android' in api.properties['buildername']:
     android_sdk_version_file = infrabots_dir.join(
         'assets', 'android_sdk', 'VERSION')
     if api.path.exists(android_sdk_version_file):
-      compile_cipd_deps.append(cipd_pkg(api, infrabots_dir, 'android_sdk'))
+      android_sdk_version = api.skia._readfile(android_sdk_version_file,
+                                               name='read android_sdk VERSION',
+                                               test_data='0').rstrip()
+      android_sdk_version = 'version:%s' % android_sdk_version
+      pkg = ('android_sdk', 'skia/bots/android_sdk', android_sdk_version)
+      compile_cipd_deps.append(pkg)
     else:
       # TODO(borenet): Remove this legacy method after 7/1/2016.
       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()
@@ skipping 21 matching lines @@
   cipd_packages = []
 
   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
 
   api.skia.download_skps(api.path['slave_build'].join('tmp'),
                          api.path['slave_build'].join('skps'))
-  if api.path.exists(api.path['slave_build'].join('skia', 'SK_IMAGE_VERSION')):
-    # TODO(borenet): Remove this once enough time has passed.
-    api.skia.download_images(api.path['slave_build'].join('tmp'),
-                             api.path['slave_build'].join('images'))
-  else:
-    cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skimage'))
+  api.skia.download_images(api.path['slave_build'].join('tmp'),
+                           api.path['slave_build'].join('images'))
 
   test_task = None
   perf_task = None
   if do_test_steps:
     test_task = test_steps_trigger(api, builder_spec, got_revision,
                                    infrabots_dir, extra_hashes, cipd_packages)
   if do_perf_steps:
     perf_task = perf_steps_trigger(api, builder_spec, got_revision,
                                    infrabots_dir, extra_hashes, cipd_packages)
   is_trybot = builder_cfg['is_trybot']
@@ skipping 96 matching lines @@
   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
 
   builder = 'Build-Win-MSVC-x86_64-Release-Vulkan'
   master = 'client.skia.compile'
   test = test_for_bot(api, builder, master, slave, 'legacy_win_toolchain',
                       legacy_win_toolchain=True)
   yield test
-
-  builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
-  master = 'client.skia'
-  test = test_for_bot(api, builder, master, slave, 'legacy_skimage_version')
-  test += api.path.exists(
-      api.path['slave_build'].join('skia', 'SK_IMAGE_VERSION'))
-  test += api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1)
-  yield test