diff options
| author |  borenet <borenet@chromium.org> | 2016-07-22 08:31:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-22 08:31:07 -0700 |
| commit | 1543487fc642b443283ace3fa37e6597cd89061f (patch) | |
| tree | 0f1780a685770b0fc9e98b3b46ca444b440bc18c /infra | |
| parent | d01a8f470f43b50feb26cc73db89809e292feee2 (diff) | |
Change SKPs to new asset management format
BUG=skia:5427
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2169653003
DOCS_PREVIEW= https://skia.org/?cl=2169653003
Review-Url: https://codereview.chromium.org/2169653003
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/assets/skp/VERSION | 1 | ||||
| -rwxr-xr-x | infra/bots/assets/skp/create.py | 9 | ||||
| -rw-r--r-- | infra/bots/perf_skia.isolate | 6 | ||||
| -rw-r--r-- | infra/bots/skps.isolate | 8 | ||||
| -rw-r--r-- | infra/bots/test_skia.isolate | 6 |
5 files changed, 18 insertions, 12 deletions
diff --git a/infra/bots/assets/skp/VERSION b/infra/bots/assets/skp/VERSION new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/infra/bots/assets/skp/VERSION @@ -0,0 +1 @@ +1
\ No newline at end of file diff --git a/infra/bots/assets/skp/create.py b/infra/bots/assets/skp/create.py index 68df7f07c2..6bf716c532 100755 --- a/infra/bots/assets/skp/create.py +++ b/infra/bots/assets/skp/create.py @@ -20,7 +20,8 @@ import utils SKIA_TOOLS = os.path.join(common.INFRA_BOTS_DIR, os.pardir, os.pardir, 'tools') -def create_asset(chrome_src_path, browser_executable, target_dir): +def create_asset(chrome_src_path, browser_executable, target_dir, + upload_to_partner_bucket): """Create the asset.""" browser_executable = os.path.realpath(browser_executable) chrome_src_path = os.path.realpath(chrome_src_path) @@ -47,6 +48,8 @@ def create_asset(chrome_src_path, browser_executable, target_dir): '--output_dir', os.getcwd(), '--chrome_src_path', chrome_src_path, ] + if upload_to_partner_bucket: + webpages_playback_cmd.append('--upload_to_partner_bucket') try: subprocess.check_call(webpages_playback_cmd) finally: @@ -75,8 +78,10 @@ def main(): parser.add_argument('--target_dir', '-t', required=True) parser.add_argument('--chrome_src_path', '-c', required=True) parser.add_argument('--browser_executable', '-e', required=True) + parser.add_argument('--upload_to_partner_bucket', action='store_true') args = parser.parse_args() - create_asset(args.chrome_src_path, args.browser_executable, args.target_dir) + create_asset(args.chrome_src_path, args.browser_executable, args.target_dir, + args.upload_to_partner_bucket) if __name__ == '__main__': diff --git a/infra/bots/perf_skia.isolate b/infra/bots/perf_skia.isolate index 8e38791ebf..e43e843938 100644 --- a/infra/bots/perf_skia.isolate +++ b/infra/bots/perf_skia.isolate @@ -4,6 +4,10 @@ 'infrabots.isolate', 'ios_bin.isolate', 'resources.isolate', - 'skps.isolate', ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, } diff --git a/infra/bots/skps.isolate b/infra/bots/skps.isolate deleted file mode 100644 index 84e986f4be..0000000000 --- a/infra/bots/skps.isolate +++ /dev/null @@ -1,8 +0,0 @@ -{ - 'variables': { - 'files': [ - '../../../skps/', - '../../../tmp/SKP_VERSION', - ], - }, -} diff --git a/infra/bots/test_skia.isolate b/infra/bots/test_skia.isolate index 8e38791ebf..e43e843938 100644 --- a/infra/bots/test_skia.isolate +++ b/infra/bots/test_skia.isolate @@ -4,6 +4,10 @@ 'infrabots.isolate', 'ios_bin.isolate', 'resources.isolate', - 'skps.isolate', ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, } |