Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1023)

Unified Diff: scripts/slave/recipes/skia/swarm_test.py

Issue 2167883004: [Skia] Convert SKPs to a CIPD package (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Non-canary bot provides --upload_to_partner_bucket Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/swarm_test.py
diff --git a/scripts/slave/recipes/skia/swarm_test.py b/scripts/slave/recipes/skia/swarm_test.py
index 0a0e6d896a4dba12e156a3d1ee799124dac7767f..7c0947f8ea3c436289e250076067773903ec98a4 100644
--- a/scripts/slave/recipes/skia/swarm_test.py
+++ b/scripts/slave/recipes/skia/swarm_test.py
@@ -85,6 +85,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
)
)
@@ -115,6 +117,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
api.step_data('dm', retcode=1)
@@ -133,6 +137,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -155,6 +161,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -179,6 +187,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -203,6 +213,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -227,6 +239,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -251,6 +265,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder, adb='/usr/bin/adb') +
@@ -276,6 +292,8 @@ def GenTests(api):
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
api.platform('win', 64)
@@ -292,6 +310,24 @@ def GenTests(api):
swarm_out_dir='[SWARM_OUT_DIR]') +
api.path.exists(
api.path['slave_build'].join('skia'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
+ api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+ )
+ )
+
+ yield (
+ api.test('legacy_skp_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('skia', 'infra', 'bots', 'assets',
+ 'skimage', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
)
)

Powered by Google App Engine
This is Rietveld 408576698