[Skia] Convert Sk Images to a CIPD package

scripts/slave/recipes/skia/swarm_test.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 test.
 
 
 DEPS = [
   'recipe_engine/json',
@@ skipping 65 matching lines @@
         test = (
           api.test(builder) +
           api.properties(buildername=builder,
                          mastername=mastername,
                          slavename=slavename,
                          buildnumber=5,
                          revision='abc123',
                          swarm_out_dir='[SWARM_OUT_DIR]') +
           api.path.exists(
               api.path['slave_build'].join('skia'),
+              api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                           'skimage', 'VERSION'),
               api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
           )
         )
         if ('Android' in builder and
             ('Test' in builder or 'Perf' in builder) and
             not 'Appurify' in builder):
           test += AndroidTestData(builder)
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
                                  rietveld='https://codereview.chromium.org')
         if 'Win' in builder:
           test += api.platform('win', 64)
 
 
         yield test
 
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   yield (
     api.test('failed_dm') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.step_data('dm', retcode=1)
   )
 
   builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
   yield (
     api.test('failed_get_hashes') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
-    api.step_data('get uninteresting hashes', retcode=1) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+    api.step_data('get uninteresting hashes', retcode=1)
   )
 
   yield (
     api.test('download_and_push_skps') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('2')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data(
         'exists skps',
-        stdout=api.raw_io.output('')) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+        stdout=api.raw_io.output(''))
   )
 
   yield (
     api.test('missing_SKP_VERSION_device') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   retcode=1) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data(
         'exists skps',
-        stdout=api.raw_io.output('')) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+        stdout=api.raw_io.output(''))
   )
 
   yield (
     api.test('download_and_push_skimage') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('2')) +
     api.step_data(
         'exists skia_images',
-        stdout=api.raw_io.output('')) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+        stdout=api.raw_io.output(''))
   )
 
   yield (
     api.test('missing_SK_IMAGE_VERSION_device') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   retcode=1) +
     api.step_data(
         'exists skia_images',
-        stdout=api.raw_io.output('')) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+        stdout=api.raw_io.output(''))
   )
 
   yield (
     api.test('adb_in_path') +
     api.properties(buildername=builder,
                    mastername='client.skia',
                    slavename='skiabot-linux-swarm-000',
                    buildnumber=6,
                    revision='abc123',
                    swarm_out_dir='[SWARM_OUT_DIR]') +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     AndroidTestData(builder, adb='/usr/bin/adb') +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
-                  stdout=api.raw_io.output('42')) +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
+                  stdout=api.raw_io.output('42'))
   )
 
+  builder = 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot'
   yield (
     api.test('big_issue_number') +
-    api.properties(buildername='Build-Win-MSVC-x86-Debug',
+    api.properties(buildername=builder,
                      mastername='client.skia.compile',
                      slavename='skiabot-linux-swarm-000',
                      buildnumber=5,
                      revision='abc123',
                      swarm_out_dir='[SWARM_OUT_DIR]',
                      rietveld='https://codereview.chromium.org',
                      patchset=1,
                      issue=2147533002L) +
     api.path.exists(
         api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+                                     'skimage', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )
+
+  builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
+  yield (
+    api.test('legacy_skimage_version') +
+    api.properties(buildername=builder,
+                   mastername='client.skia',
+                   slavename='skiabot-linux-swarm-000',
+                   buildnumber=6,
+                   revision='abc123',
+                   swarm_out_dir='[SWARM_OUT_DIR]') +
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    )
+  )