[Skia] Convert SKPs 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 653 matching lines @@
 
   # CIPD packages needed by test/perf.
   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'))
+  # SKPs, SkImages.
+  if api.path.exists(infrabots_dir.join('assets', 'skp', 'VERSION')):
+    cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skp'))
+  else:

[rmistry, 2016/07/22 14:26:15]

Nit: Add a "# TODO(borenet): Remove this once enough time has passed." here as
well?

[borenet, 2016/07/22 14:49:53]

Done.

+    api.skia.download_skps(api.path['slave_build'].join('tmp'),
+                           api.path['slave_build'].join('skps'))
   if api.path.exists(infrabots_dir.join('assets', 'skimage', 'VERSION')):
     cipd_packages.append(cipd_pkg(api, infrabots_dir, 'skimage'))
   else:
     # 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'))
 
+  # Trigger test and perf tasks.
   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']
   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,
                  legacy_android_sdk=False, legacy_win_toolchain=False,
-                 legacy_skimage_version=False, legacy_win_vulkan_sdk=False):
+                 legacy_skimage_version=False, legacy_win_vulkan_sdk=False,
+                 legacy_skp_version=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')
   )
@@ skipping 35 matching lines @@
   if 'Win' in builder:
     if not legacy_win_toolchain:
       paths.append(api.path['slave_build'].join(
           'skia', 'infra', 'bots', 'assets', 'win_toolchain', 'VERSION'))
     if not legacy_win_vulkan_sdk:
       paths.append(api.path['slave_build'].join(
           'skia', 'infra', 'bots', 'assets', 'win_vulkan_sdk', 'VERSION'))
   if not legacy_skimage_version:
     paths.append(api.path['slave_build'].join(
         'skia', 'infra', 'bots', 'assets', 'skimage', 'VERSION'))
+  if not legacy_skp_version:
+    paths.append(api.path['slave_build'].join(
+        'skia', 'infra', 'bots', 'assets', 'skp', 'VERSION'))
   if 'RecreateSKPs' in builder:
     test += api.step_data(
         'upload new .isolated file for RecreateSKPs_skia',
         stdout=api.raw_io.output('def456 XYZ.isolated'))
 
   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)
 
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   master = 'client.skia'
   slave = 'skiabot-linux-test-000'
-  test = test_for_bot(api, builder, master, slave, 'No_downloaded_SKP_VERSION')
+  test = test_for_bot(api, builder, master, slave, 'No_downloaded_SKP_VERSION',
+                      legacy_skp_version=True)
   test += api.step_data('Get downloaded SKP_VERSION', retcode=1)
   yield test
 
   test = test_for_bot(api, builder, master, slave,
-                      'Wrong_downloaded_SKP_VERSION')
+                      'Wrong_downloaded_SKP_VERSION', legacy_skp_version=True)
   test += api.properties(test_downloaded_skp_version='999')
   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, '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
 
   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, legacy_win_vulkan_sdk=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',
                       legacy_skimage_version=True)
   test += api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1)
   yield test
+
+  test = test_for_bot(api, builder, master, slave, 'legacy_skp_version',
+                      legacy_skp_version=True)
+  test += api.step_data('Get downloaded SKP_VERSION', retcode=1)
+  yield test