Revert of [CT] Use zips of SKPs to speed up "isolate tests" in recipes

scripts/slave/recipes/skia/ct_skps.py

 # Copyright 2015 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.
 
 from common.skia import global_constants
 
 
 DEPS = [
   'ct_swarming',
   'file',
   'depot_tools/gclient',
   'gsutil',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/step',
   'recipe_engine/time',
   'swarming',
   'swarming_client',
   'depot_tools/tryserver',
-  'zip',
 ]
 
 
 CT_SKPS_ISOLATE = 'ct_skps.isolate'
 
 # Do not batch archive more slaves than this value. This is used to prevent
 # no output timeouts in the 'isolate tests' step.
 MAX_SLAVES_TO_BATCHARCHIVE = 100
 
 # Number of slaves to shard CT runs to.
@@ skipping 64 matching lines @@
   api.tryserver.maybe_apply_issue()
 
   # Build the tool.
   api.step('build %s' % skia_tool,
            ['make', skia_tool, 'BUILDTYPE=%s' % configuration],
            cwd=api.path['checkout'])
 
   skps_chromium_build = api.properties.get(
       'skps_chromium_build', DEFAULT_SKPS_CHROMIUM_BUILD)
   ct_num_slaves = api.properties.get('ct_num_slaves', DEFAULT_CT_NUM_SLAVES)
-  skps_dir = api.path['slave_build'].join('skps')
 
   # Set build property to make finding SKPs convenient.
   api.step.active_result.presentation.properties['Location of SKPs'] = (
       'https://pantheon.corp.google.com/storage/browser/%s/skps/%s/%s/' % (
           api.ct_swarming.CT_GS_BUCKET, ct_page_type, skps_chromium_build))
 
   # Delete swarming_temp_dir to ensure it starts from a clean slate.
   api.file.rmtree('swarming temp dir', api.ct_swarming.swarming_temp_dir)
 
   for slave_num in range(1, ct_num_slaves + 1):
     # Download SKPs.
     api.ct_swarming.download_skps(
-        ct_page_type, slave_num, skps_chromium_build, skps_dir)
-
-    # Zip up the SKPs due to https://github.com/luci/luci-go/issues/9
-    api.zip.directory(step_name='zip skps dir',
-                      directory=skps_dir.join('slave%s' % slave_num),
-                      output=skps_dir.join('slave%s.zip' % slave_num))
+        ct_page_type, slave_num, skps_chromium_build,
+        api.path['slave_build'].join('skps'))
 
     # Create this slave's isolated.gen.json file to use for batcharchiving.
     isolate_dir = chromium_checkout.join('chrome')
     isolate_path = isolate_dir.join(CT_SKPS_ISOLATE)
     extra_variables = {
         'SLAVE_NUM': str(slave_num),
         'TOOL_NAME': skia_tool,
         'GIT_HASH': skia_hash,
         'CONFIGURATION': configuration,
     }
@@ skipping 132 matching lines @@
     api.test('CT_DM_10k_SKPs_Trybot') +
     api.properties(
         buildername=
             'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot',
         ct_num_slaves=ct_num_slaves,
         rietveld='codereview.chromium.org',
         issue=1499623002,
         patchset=1,
     )
   )