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

scripts/slave/recipe_modules/skia/api.py

 # Copyright 2014 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 os
 import re
 import sys
 
@@ skipping 187 matching lines @@
 
     # Obtain the spec for this builder from the Skia repo. Use it to set more
     # properties.
     self.builder_spec = self.get_builder_spec(self.skia_dir, self.builder_name)
 
     self.builder_cfg = self.builder_spec['builder_cfg']
     self.role = self.builder_cfg['role']
 
     # Set some important variables.
     self.resource_dir = self.skia_dir.join('resources')
-    self.images_dir = self.slave_dir.join('skimage')
-    if self.m.path.exists(self.skia_dir.join('SK_IMAGE_VERSION')):
-      # TODO(borenet): Remove this once enough time has passed.
-      self.images_dir = self.slave_dir.join('images')
+    self.images_dir = self.slave_dir.join('images')
     self.skia_out = self.skia_dir.join('out', self.builder_name)
     self.swarming_out_dir = self.make_path(self.m.properties['swarm_out_dir'])
     self.local_skp_dir = self.slave_dir.join('skps')
     if not self.is_compile_bot:
       self.skia_out = self.slave_dir.join('out')
     self.tmp_dir = self.m.path['slave_build'].join('tmp')
 
     self.gsutil_env_chromium_skia_gm = self.gsutil_env(BOTO_CHROMIUM_SKIA_GM)
 
     self.device_dirs = None
@@ skipping 299 matching lines @@
         GS_SUBDIR_TMPL_SK_IMAGE,
         tmp_dir,
         local_images_dir,
         test_expected_version=TEST_EXPECTED_SK_IMAGE_VERSION,
         test_actual_version=self.m.properties.get(
             'test_downloaded_sk_image_version',
             TEST_EXPECTED_SK_IMAGE_VERSION))
 
   def _copy_images(self):
     """Download and copy test images if needed."""
-    if self.m.path.exists(self.skia_dir.join(VERSION_FILE_SK_IMAGE)):
-      # TODO(borenet): Remove this once enough time has passed.
-      version = self.check_actual_version(
-          VERSION_FILE_SK_IMAGE,
-          self.tmp_dir,
-          test_actual_version=self.m.properties.get(
-              'test_downloaded_sk_image_version',
-              TEST_EXPECTED_SK_IMAGE_VERSION),
-      )
-    else:
-      version_file = self.infrabots_dir.join('assets', 'skimage', 'VERSION')
-      test_data = self.m.properties.get(
-          'test_actual_skp_version', TEST_EXPECTED_SKP_VERSION)
-      version = self._readfile(version_file,
-                               name='Get downloaded skimage VERSION',
-                               test_data=test_data).rstrip()
-      self._writefile(self.m.path.join(self.tmp_dir, VERSION_FILE_SK_IMAGE),
-                      version)
+    version = self.check_actual_version(
+        VERSION_FILE_SK_IMAGE,
+        self.tmp_dir,
+        test_actual_version=self.m.properties.get(
+            'test_downloaded_sk_image_version',
+            TEST_EXPECTED_SK_IMAGE_VERSION),
+    )
     self.copy_dir(
         version,
         VERSION_FILE_SK_IMAGE,
         self.tmp_dir,
         self.images_dir,
         self.device_dirs.images_dir,
         test_expected_version=self.m.properties.get(
             'test_downloaded_sk_image_version',
             TEST_EXPECTED_SK_IMAGE_VERSION),
         test_actual_version=self.m.properties.get(
@@ skipping 303 matching lines @@
     # Don't bother to include role, which is always Test.
     # TryBots are uploaded elsewhere so they can use the same key.
     blacklist = ['role', 'is_trybot']
 
     flat = []
     for k in sorted(self.builder_cfg.keys()):
       if k not in blacklist:
         flat.append(k)
         flat.append(self.builder_cfg[k])
     return flat