Tear down old iOS bots, bring up one new one.

This replaces all GYP-based iOS bots with one new GN-based one.
Ordinarily I'd do this more incrementally but we have only one iPad.

This new bot will start very broken, but should be the quickest
to cycle builds once I get it working.

Change-Id: I41865e3ad431dea3cf023d0b33ccc88e175cf227
Reviewed-on: https://skia-review.googlesource.com/7941
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2017-02-02 13:45:15 -05:00
parent 47784c18ad
commit 2098008fee
14 changed files with 299 additions and 2534 deletions

View File

@ -1,11 +1,9 @@
[
"Build-Mac-Clang-Arm7-Debug-iOS",
"Build-Mac-Clang-Arm7-Release-iOS",
"Build-Mac-Clang-arm-Debug-GN_iOS",
"Build-Mac-Clang-arm-Release-GN_iOS",
"Build-Mac-Clang-arm-Debug-iOS",
"Build-Mac-Clang-arm-Release-iOS",
"Build-Mac-Clang-arm64-Debug-Android",
"Build-Mac-Clang-arm64-Debug-GN_iOS",
"Build-Mac-Clang-arm64-Release-GN_iOS",
"Build-Mac-Clang-arm64-Debug-iOS",
"Build-Mac-Clang-arm64-Release-iOS",
"Build-Mac-Clang-x86_64-Debug",
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
"Build-Mac-Clang-x86_64-Release",
@ -164,8 +162,6 @@
"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
@ -267,6 +263,5 @@
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
"Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
]

View File

@ -1,173 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[CUSTOM_/_B_WORK]",
"511"
],
"name": "makedirs checkout_path",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
"cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"skia\": \"got_revision\"}",
"--git-cache-dir",
"[CUSTOM_/_B_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123",
"--output_manifest"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[CUSTOM_/_B_WORK]/skia/platform_tools/ios/bin/ios_ninja"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
},
"name": "build iOSShell"
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS/Release",
"[CUSTOM_[SWARM_OUT_DIR]]/out/Release"
],
"name": "copy build products",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[CUSTOM_/_B_WORK]/skia/xcodebuild/Release-iphoneos",
"[CUSTOM_[SWARM_OUT_DIR]]/xcodebuild/Release-iphoneos"
],
"name": "copy build products (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

View File

@ -45,7 +45,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-GN_iOS"
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
},
"name": "bot_update",
"~followup_annotations": [
@ -91,7 +91,7 @@
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-GN_iOS/Debug",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
"--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"arm64\" target_os=\"ios\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
@ -104,7 +104,7 @@
"cmd": [
"ninja",
"-C",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-GN_iOS/Debug"
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
@ -117,7 +117,7 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-GN_iOS/Debug",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
"[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"name": "copy build products",

View File

@ -17,8 +17,7 @@ DEPS = [
TEST_BUILDERS = {
'client.skia.compile': {
'skiabot-linux-swarm-000': [
'Build-Mac-Clang-Arm7-Release-iOS',
'Build-Mac-Clang-arm64-Debug-GN_iOS',
'Build-Mac-Clang-arm64-Debug-iOS',
'Build-Mac-Clang-mipsel-Debug-GN_Android',
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
'Build-Mac-Clang-x86_64-Release-GN',

View File

@ -11,7 +11,6 @@ from recipe_engine import recipe_api
from . import default_flavor
from . import gn_android_flavor
from . import gn_flavor
from . import ios_flavor
from . import pdfium_flavor
from . import valgrind_flavor
@ -30,11 +29,6 @@ def is_android(builder_cfg):
return 'Android' in builder_cfg.get('extra_config', '')
def is_ios(builder_cfg):
return ('iOS' == builder_cfg.get('extra_config', '') or
builder_cfg.get('os') == 'iOS')
def is_pdfium(builder_cfg):
return 'PDFium' in builder_cfg.get('extra_config', '')
@ -48,8 +42,6 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
"""Return a flavor utils object specific to the given builder."""
if is_android(builder_cfg):
return gn_android_flavor.GNAndroidFlavorUtils(self.m)
elif is_ios(builder_cfg):
return ios_flavor.iOSFlavorUtils(self.m)
elif is_pdfium(builder_cfg):
return pdfium_flavor.PDFiumFlavorUtils(self.m)
elif is_valgrind(builder_cfg):
@ -130,8 +122,8 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
if str(actual_version_file) != str(device_version_file):
try:
device_version = self.read_file_on_device(device_version_file)
except self.m.step.StepFailure:
device_version = VERSION_NONE
except self.m.step.StepFailure: # pragma: nocover
device_version = VERSION_NONE # pragma: nocover
if device_version != host_version:
self.remove_file_on_device(device_version_file)
self.create_clean_device_dir(device_path)

View File

@ -1,168 +0,0 @@
# 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.
# pylint: disable=W0201
import copy
import default_flavor
"""iOS flavor utils, used for building for and running tests on iOS."""
class iOSFlavorUtils(default_flavor.DefaultFlavorUtils):
def __init__(self, m):
super(iOSFlavorUtils, self).__init__(m)
self.default_env = {}
self.default_env['XCODEBUILD'] = (
self.m.vars.slave_dir.join('xcodebuild'))
self.ios_bin = self.m.vars.skia_dir.join(
'platform_tools', 'ios', 'bin')
def step(self, name, cmd, **kwargs):
args = [self.ios_bin.join('ios_run_skia')]
env = {}
env.update(kwargs.pop('env', {}))
env.update(self.default_env)
# Convert 'dm' and 'nanobench' from positional arguments
# to flags, which is what iOSShell expects to select which
# one is being run.
cmd = ["--" + c if c in ['dm', 'nanobench'] else c
for c in cmd]
return self.m.run(self.m.step, name=name, cmd=args + cmd,
env=env, **kwargs)
def compile(self, target, **kwargs):
"""Build the given target."""
cmd = [self.ios_bin.join('ios_ninja')]
self.m.run(self.m.step, 'build iOSShell', cmd=cmd,
cwd=self.m.path['checkout'], **kwargs)
def device_path_join(self, *args):
"""Like os.path.join(), but for paths on a connected iOS device."""
return '/'.join(args)
def _remove_device_dir(self, path):
"""Remove the directory on the device."""
return self.m.run(
self.m.step,
'rmdir %s' % path,
cmd=[self.ios_bin.join('ios_rm'), path],
env=self.default_env,
infra_step=True,
)
def _create_device_dir(self, path):
"""Create the directory on the device."""
return self.m.run(
self.m.step,
'mkdir %s' % path,
cmd=[self.ios_bin.join('ios_mkdir'), path],
env=self.default_env,
infra_step=True,
)
def copy_directory_contents_to_device(self, host_dir, device_dir):
"""Like shutil.copytree(), but for copying to a connected device."""
return self.m.run(
self.m.step,
name='push %s to %s' % (self.m.path.basename(host_dir),
self.m.path.basename(device_dir)),
cmd=[self.ios_bin.join('ios_push_if_needed'),
host_dir, device_dir],
env=self.default_env,
infra_step=True,
)
def copy_directory_contents_to_host(self, device_dir, host_dir):
"""Like shutil.copytree(), but for copying from a connected device."""
self.m.run(
self.m.step,
name='pull %s' % self.m.path.basename(device_dir),
cmd=[self.ios_bin.join('ios_pull_if_needed'),
device_dir, host_dir],
env=self.default_env,
infra_step=True,
)
def copy_file_to_device(self, host_path, device_path):
"""Like shutil.copyfile, but for copying to a connected device."""
self.m.run(
self.m.step,
name='push %s' % host_path,
cmd=[self.ios_bin.join('ios_push_file'), host_path, device_path],
env=self.default_env,
infra_step=True,
)
def copy_extra_build_products(self, swarming_out_dir):
xcode_dir = self.m.path.join(
'xcodebuild', '%s-iphoneos' % self.m.vars.configuration)
self.m.run.copy_build_products(
self.m.vars.skia_dir.join(xcode_dir),
swarming_out_dir.join(xcode_dir))
def create_clean_device_dir(self, path):
"""Like shutil.rmtree() + os.makedirs(), but on a connected device."""
self._remove_device_dir(path)
self._create_device_dir(path)
def install(self):
"""Run device-specific installation steps."""
prefix = self.device_path_join('skiabot', 'skia_')
self.device_dirs = default_flavor.DeviceDirs(
dm_dir=prefix + 'dm',
perf_data_dir=prefix + 'perf',
resource_dir=prefix + 'resources',
images_dir=prefix + 'images',
skp_dir=prefix + 'skp/skps',
svg_dir=prefix + 'svg/svgs',
tmp_dir=prefix + 'tmp_dir')
self.m.run(
self.m.step,
name='install iOSShell',
cmd=[self.ios_bin.join('ios_install')],
env=self.default_env,
infra_step=True)
def cleanup_steps(self):
"""Run any device-specific cleanup steps."""
if self.m.vars.role in (self.m.builder_name_schema.BUILDER_ROLE_TEST,
self.m.builder_name_schema.BUILDER_ROLE_PERF):
self.m.run(
self.m.step,
name='reboot',
cmd=[self.ios_bin.join('ios_restart')],
env=self.default_env,
infra_step=True)
self.m.run(
self.m.step,
name='wait for reboot',
cmd=['sleep', '20'],
env=self.default_env,
infra_step=True)
def read_file_on_device(self, path):
"""Read the given file."""
ret = self.m.run(
self.m.step,
name='read %s' % self.m.path.basename(path),
cmd=[self.ios_bin.join('ios_cat_file'), path],
env=self.default_env,
stdout=self.m.raw_io.output(),
infra_step=True)
return ret.stdout.rstrip() if ret.stdout else ret.stdout
def remove_file_on_device(self, path):
"""Remove the file on the device."""
return self.m.run(
self.m.step,
'rm %s' % path,
cmd=[self.ios_bin.join('ios_rm'), path],
env=self.default_env,
infra_step=True,
)

View File

@ -1,429 +0,0 @@
[
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_install"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "install iOSShell"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skia/resources",
"skiabot/skia_resources"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push resources to skia_resources"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SKP VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
"name": "write SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SKP_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skp",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skp to skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SKP_VERSION",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SKP_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skimage",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skimage to skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SVG VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SVG_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/svg",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push svg to svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SVG_VERSION",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia",
"--nanobench",
"--undefok",
"-i",
"skiabot/skia_resources",
"--skps",
"skiabot/skia_skp/skps",
"--images",
"skiabot/skia_images/nanobench",
"--svgs",
"skiabot/skia_svg/svgs",
"--nocpu",
"--pre_log",
"--images",
"--gpuStatsDump",
"true",
"--scales",
"1.0",
"1.1",
"--skps",
"ignore_skps",
"--config",
"8888",
"gpu",
"nonrendering",
"hwui",
"f16",
"srgb",
"msaa16",
"nvpr16",
"nvprdit16",
"--match",
"~blurroundrect",
"~patch_grid",
"~desk_carsvg",
"~keymobi",
"~path_hairline",
"~GLInstancedArraysBench",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
"~inc0.jpg",
"~incGray.jpg",
"~inc0.wbmp",
"~inc1.wbmp",
"~inc0.webp",
"~inc1.webp",
"~inc0.ico",
"~inc1.ico",
"~inc0.png",
"~inc1.png",
"~inc2.png",
"~inc12.png",
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "nanobench"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_restart"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "reboot"
},
{
"cmd": [
"sleep",
"20"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "wait for reboot"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

View File

@ -0,0 +1,215 @@
[
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SKP VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
"name": "write SKP_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SVG VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data"
],
"env": {
"PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data",
"511"
],
"name": "makedirs data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"[START_DIR]/out/Release/nanobench",
"--undefok",
"-i",
"[START_DIR]/skia/resources",
"--skps",
"[START_DIR]/skp",
"--images",
"[START_DIR]/skimage/nanobench",
"--svgs",
"[START_DIR]/svg",
"--nocpu",
"--pre_log",
"--images",
"--gpuStatsDump",
"true",
"--scales",
"1.0",
"1.1",
"--skps",
"ignore_skps",
"--config",
"8888",
"gpu",
"nonrendering",
"hwui",
"f16",
"srgb",
"msaa16",
"nvpr16",
"nvprdit16",
"--match",
"~blurroundrect",
"~patch_grid",
"~desk_carsvg",
"~keymobi",
"~path_hairline",
"~GLInstancedArraysBench",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
"~inc0.jpg",
"~incGray.jpg",
"~inc0.wbmp",
"~inc1.wbmp",
"~inc0.webp",
"~inc1.webp",
"~inc0.ico",
"~inc1.ico",
"~inc0.png",
"~inc1.png",
"~inc2.png",
"~inc12.png",
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
"build_number",
"5",
"--key",
"arch",
"arm",
"compiler",
"Clang",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"GX6450",
"model",
"iPadMini4",
"os",
"iOS"
],
"cwd": "[START_DIR]/skia",
"name": "nanobench"
},
{
"cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data",
"511"
],
"name": "makedirs perf_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

View File

@ -37,7 +37,7 @@ TEST_BUILDERS = {
'Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE',
'Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
'Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release'
],
},
}

View File

@ -1,30 +1,4 @@
[
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_install"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "install iOSShell"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skia/resources",
"skiabot/skia_resources"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push resources to skia_resources"
},
{
"cmd": [
"python",
@ -45,87 +19,6 @@
],
"name": "write SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SKP_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skp",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skp to skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SKP_VERSION",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SKP_VERSION"
},
{
"cmd": [
"python",
@ -146,87 +39,6 @@
],
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skimage",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skimage to skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
@ -247,87 +59,6 @@
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SVG_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/svg",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push svg to svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SVG_VERSION",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SVG_VERSION"
},
{
"cmd": [
"python",
@ -372,32 +103,6 @@
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_dm"
},
{
"cmd": [
"python",
@ -429,7 +134,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
@ -470,31 +175,16 @@
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"skiabot/skia_tmp_dir/uninteresting_hashes.txt"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/uninteresting_hashes.txt"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia",
"--dm",
"[START_DIR]/out/Release/dm",
"--undefok",
"--resourcePath",
"skiabot/skia_resources",
"[START_DIR]/skia/resources",
"--skps",
"skiabot/skia_skp/skps",
"[START_DIR]/skp",
"--images",
"skiabot/skia_images/dm",
"[START_DIR]/skimage/dm",
"--colorImages",
"skiabot/skia_images/colorspace",
"[START_DIR]/skimage/colorspace",
"--nameByHash",
"--properties",
"gitHash",
@ -502,30 +192,30 @@
"master",
"client.skia",
"builder",
"Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug",
"Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
"build_number",
"5",
"--svgs",
"skiabot/skia_svg/svgs",
"[START_DIR]/svg",
"--key",
"arch",
"Arm7",
"arm",
"compiler",
"Clang",
"configuration",
"Debug",
"Release",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"SGX554",
"GX6450",
"model",
"iPad4",
"iPadMini4",
"os",
"iOS",
"--uninterestingHashesFile",
"skiabot/skia_tmp_dir/uninteresting_hashes.txt",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"--writePath",
"skiabot/skia_dm",
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
"--nocpu",
"--config",
"8888",
@ -534,6 +224,7 @@
"gpudft",
"gpusrgb",
"pdf",
"msaa4",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@ -933,53 +624,9 @@
"_",
".SRW"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"cwd": "[START_DIR]/skia",
"name": "dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"skiabot/skia_dm",
"[CUSTOM_[SWARM_OUT_DIR]]/dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "pull skia_dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_restart"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "reboot"
},
{
"cmd": [
"sleep",
"20"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "wait for reboot"
},
{
"name": "$result",
"recipe_result": null,

View File

@ -1,992 +0,0 @@
[
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_install"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "install iOSShell"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skia/resources",
"skiabot/skia_resources"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push resources to skia_resources"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SKP VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
"name": "write SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SKP_VERSION",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_EXCEPTION@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_skp/skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skp",
"skiabot/skia_skp/skps"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skp to skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SKP_VERSION",
"skiabot/skia_tmp_dir/SKP_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SKP_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skimage",
"skiabot/skia_images"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push skimage to skia_images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"name": "Get downloaded SVG VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "read SVG_VERSION",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rm skiabot/skia_tmp_dir/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_svg/svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/svg",
"skiabot/skia_svg/svgs"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push svg to svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SVG_VERSION",
"skiabot/skia_tmp_dir/SVG_VERSION"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/SVG_VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[CUSTOM_[SWARM_OUT_DIR]]/dm"
],
"env": {
"PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
"511"
],
"name": "makedirs dm",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skiabot/skia_dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "rmdir skiabot/skia_dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skiabot/skia_dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "mkdir skiabot/skia_dm"
},
{
"cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
"[START_DIR]/tmp",
"511"
],
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "get uninteresting hashes",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
"@@@STEP_LOG_LINE@python.inline@import math@@@",
"@@@STEP_LOG_LINE@python.inline@import socket@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@import time@@@",
"@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@",
"@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
"@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
"@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
"@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
"@@@STEP_LOG_LINE@python.inline@ try:@@@",
"@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@",
"@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
"@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@",
"@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@",
"@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@",
"@@@STEP_LOG_LINE@python.inline@ break@@@",
"@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
"@@@STEP_LOG_LINE@python.inline@ print e@@@",
"@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@",
"@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/uninteresting_hashes.txt",
"skiabot/skia_tmp_dir/uninteresting_hashes.txt"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "push [START_DIR]/tmp/uninteresting_hashes.txt"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_run_skia",
"--dm",
"--undefok",
"--resourcePath",
"skiabot/skia_resources",
"--skps",
"skiabot/skia_skp/skps",
"--images",
"skiabot/skia_images/dm",
"--colorImages",
"skiabot/skia_images/colorspace",
"--nameByHash",
"--properties",
"gitHash",
"abc123",
"master",
"client.skia",
"builder",
"Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug",
"build_number",
"6",
"--svgs",
"skiabot/skia_svg/svgs",
"--key",
"arch",
"Arm7",
"compiler",
"Clang",
"configuration",
"Debug",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"SGX554",
"model",
"iPad4",
"os",
"iOS",
"--uninterestingHashesFile",
"skiabot/skia_tmp_dir/uninteresting_hashes.txt",
"--writePath",
"skiabot/skia_dm",
"--nocpu",
"--config",
"8888",
"srgb",
"gpu",
"gpudft",
"gpusrgb",
"pdf",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
"--src",
"tests",
"gm",
"image",
"colorImage",
"svg",
"--blacklist",
"gpusrgb",
"image",
"_",
"_",
"8888",
"image",
"_",
"_",
"gpu",
"skp",
"_",
"_",
"_",
"image",
"gen_platf",
"rgba32abf.bmp",
"_",
"image",
"gen_platf",
"rgb24prof.bmp",
"_",
"image",
"gen_platf",
"rgb24lprof.bmp",
"_",
"image",
"gen_platf",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"frame_larger_than_image.gif",
"_",
"image",
"gen_platf",
"inc0.png",
"_",
"image",
"gen_platf",
"inc1.png",
"_",
"image",
"gen_platf",
"inc2.png",
"_",
"image",
"gen_platf",
"inc3.png",
"_",
"image",
"gen_platf",
"inc4.png",
"_",
"image",
"gen_platf",
"inc5.png",
"_",
"image",
"gen_platf",
"inc6.png",
"_",
"image",
"gen_platf",
"inc7.png",
"_",
"image",
"gen_platf",
"inc8.png",
"_",
"image",
"gen_platf",
"inc9.png",
"_",
"image",
"gen_platf",
"inc10.png",
"_",
"image",
"gen_platf",
"inc11.png",
"_",
"image",
"gen_platf",
"inc12.png",
"_",
"image",
"gen_platf",
"inc13.png",
"_",
"image",
"gen_platf",
"inc14.png",
"_",
"test",
"_",
"GrShape",
"serialize-8888",
"gm",
"_",
"bleed_image",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
"_",
"colortype",
"serialize-8888",
"gm",
"_",
"colortype_xfermodes",
"serialize-8888",
"gm",
"_",
"drawfilter",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_0.75_0",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_1_-0.25",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds",
"serialize-8888",
"gm",
"_",
"fontmgr_match",
"serialize-8888",
"gm",
"_",
"fontmgr_iter",
"serialize-8888",
"gm",
"_",
"imagemasksubset",
"serialize-8888",
"gm",
"_",
"bitmapfilters",
"serialize-8888",
"gm",
"_",
"bitmapshaders",
"serialize-8888",
"gm",
"_",
"bleed",
"serialize-8888",
"gm",
"_",
"bleed_alpha_bmp",
"serialize-8888",
"gm",
"_",
"bleed_alpha_bmp_shader",
"serialize-8888",
"gm",
"_",
"convex_poly_clip",
"serialize-8888",
"gm",
"_",
"extractalpha",
"serialize-8888",
"gm",
"_",
"filterbitmap_checkerboard_32_32_g8",
"serialize-8888",
"gm",
"_",
"filterbitmap_image_mandrill_64",
"serialize-8888",
"gm",
"_",
"shadows",
"serialize-8888",
"gm",
"_",
"simpleaaclip_aaclip",
"serialize-8888",
"gm",
"_",
"composeshader_bitmap",
"serialize-8888",
"gm",
"_",
"scaled_tilemodes_npot",
"serialize-8888",
"gm",
"_",
"scaled_tilemodes",
"serialize-8888",
"gm",
"_",
"typefacerendering_pfaMac",
"serialize-8888",
"gm",
"_",
"parsedpaths",
"serialize-8888",
"gm",
"_",
"ImageGeneratorExternal_rect",
"serialize-8888",
"gm",
"_",
"ImageGeneratorExternal_shader",
"serialize-8888",
"gm",
"_",
"shadow_utils",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image_shader",
"pic-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"gamut",
"serialize-8888",
"gm",
"_",
"gamut",
"pic-8888",
"gm",
"_",
"complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
"pic-8888",
"gm",
"_",
"complexclip4_aa",
"serialize-8888",
"gm",
"_",
"complexclip4_aa",
"tiles_rt-8888",
"gm",
"_",
"complexclip4_bw",
"tiles_rt-8888",
"gm",
"_",
"complexclip4_aa",
"_",
"image",
"_",
"interlaced1.png",
"_",
"image",
"_",
"interlaced2.png",
"_",
"image",
"_",
"interlaced3.png",
"_",
"image",
"_",
".arw",
"_",
"image",
"_",
".cr2",
"_",
"image",
"_",
".dng",
"_",
"image",
"_",
".nef",
"_",
"image",
"_",
".nrw",
"_",
"image",
"_",
".orf",
"_",
"image",
"_",
".raf",
"_",
"image",
"_",
".rw2",
"_",
"image",
"_",
".pef",
"_",
"image",
"_",
".srw",
"_",
"image",
"_",
".ARW",
"_",
"image",
"_",
".CR2",
"_",
"image",
"_",
".DNG",
"_",
"image",
"_",
".NEF",
"_",
"image",
"_",
".NRW",
"_",
"image",
"_",
".ORF",
"_",
"image",
"_",
".RAF",
"_",
"image",
"_",
".RW2",
"_",
"image",
"_",
".PEF",
"_",
"image",
"_",
".SRW"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_pull_if_needed",
"skiabot/skia_dm",
"[CUSTOM_[SWARM_OUT_DIR]]/dm"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "pull skia_dm"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_restart"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "reboot"
},
{
"cmd": [
"sleep",
"20"
],
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"SKIA_OUT": "[START_DIR]/out",
"XCODEBUILD": "[START_DIR]/xcodebuild"
},
"name": "wait for reboot"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

View File

@ -46,7 +46,7 @@ TEST_BUILDERS = {
'Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan',
'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
'Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
'Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release',
],
},
}
@ -136,29 +136,6 @@ def GenTests(api):
api.step_data('get uninteresting hashes', retcode=1)
)
builder = 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug'
yield (
api.test('missing_SKP_VERSION_device') +
api.properties(buildername=builder,
mastername='client.skia',
slavename='skiabot-linux-swarm-000',
buildnumber=6,
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.path.exists(
api.path['start_dir'].join('skia'),
api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
'skimage', 'VERSION'),
api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
'svg', 'VERSION'),
api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
) +
api.step_data('read SKP_VERSION', retcode=1)
)
builder = 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot'
yield (
api.test('big_issue_number') +

View File

@ -77,19 +77,40 @@
},
{
"cmd": [
"[CUSTOM_/_B_WORK]/skia/platform_tools/ios/bin/ios_ninja"
"python",
"-u",
"[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "build iOSShell"
"name": "fetch-gn"
},
{
"cmd": [
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS/Release",
"--args=cc=\"clang\" cxx=\"clang++\" is_debug=false target_cpu=\"Arm7\" target_os=\"ios\""
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gn gen"
},
{
"cmd": [
"ninja",
"-C",
"[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS/Release"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "ninja"
},
{
"cmd": [
@ -128,43 +149,6 @@
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
"[CUSTOM_/_B_WORK]/skia/xcodebuild/Release-iphoneos",
"[CUSTOM_[SWARM_OUT_DIR]]/xcodebuild/Release-iphoneos"
],
"name": "copy build products (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
"@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

View File

@ -1,27 +1,15 @@
{
"jobs": {
"Build-Mac-Clang-Arm7-Debug-iOS": {
"Build-Mac-Clang-arm-Debug-iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-Arm7-Debug-iOS"
"Build-Mac-Clang-arm-Debug-iOS"
]
},
"Build-Mac-Clang-Arm7-Release-iOS": {
"Build-Mac-Clang-arm-Release-iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-Arm7-Release-iOS"
]
},
"Build-Mac-Clang-arm-Debug-GN_iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-arm-Debug-GN_iOS"
]
},
"Build-Mac-Clang-arm-Release-GN_iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-arm-Release-GN_iOS"
"Build-Mac-Clang-arm-Release-iOS"
]
},
"Build-Mac-Clang-arm64-Debug-Android": {
@ -30,16 +18,16 @@
"Build-Mac-Clang-arm64-Debug-Android"
]
},
"Build-Mac-Clang-arm64-Debug-GN_iOS": {
"Build-Mac-Clang-arm64-Debug-iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-arm64-Debug-GN_iOS"
"Build-Mac-Clang-arm64-Debug-iOS"
]
},
"Build-Mac-Clang-arm64-Release-GN_iOS": {
"Build-Mac-Clang-arm64-Release-iOS": {
"priority": 0.8,
"tasks": [
"Build-Mac-Clang-arm64-Release-GN_iOS"
"Build-Mac-Clang-arm64-Release-iOS"
]
},
"Build-Mac-Clang-x86_64-Debug": {
@ -992,18 +980,6 @@
"Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
]
},
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
"priority": 0.8,
"tasks": [
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug"
]
},
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"priority": 0.8,
"tasks": [
"Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
]
},
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
"priority": 0.8,
"tasks": [
@ -1611,21 +1587,15 @@
"Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
]
},
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
"Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
"priority": 0.8,
"tasks": [
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug"
]
},
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"priority": 0.8,
"tasks": [
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
]
}
},
"tasks": {
"Build-Mac-Clang-Arm7-Debug-iOS": {
"Build-Mac-Clang-arm-Debug-iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
@ -1636,7 +1606,7 @@
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-Arm7-Debug-iOS",
"buildername=Build-Mac-Clang-arm-Debug-iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -1650,7 +1620,7 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Mac-Clang-Arm7-Release-iOS": {
"Build-Mac-Clang-arm-Release-iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
@ -1661,57 +1631,7 @@
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-Arm7-Release-iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Mac-Clang-arm-Debug-GN_iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-arm-Debug-GN_iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Mac-Clang-arm-Release-GN_iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-arm-Release-GN_iOS",
"buildername=Build-Mac-Clang-arm-Release-iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -1757,7 +1677,7 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Mac-Clang-arm64-Debug-GN_iOS": {
"Build-Mac-Clang-arm64-Debug-iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
@ -1768,7 +1688,7 @@
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-arm64-Debug-GN_iOS",
"buildername=Build-Mac-Clang-arm64-Debug-iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -1782,7 +1702,7 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Mac-Clang-arm64-Release-GN_iOS": {
"Build-Mac-Clang-arm64-Release-iOS": {
"dimensions": [
"gpu:none",
"os:Mac-10.11",
@ -1793,7 +1713,7 @@
"../../..",
"swarm_compile",
"repository=<(REPO)",
"buildername=Build-Mac-Clang-arm64-Release-GN_iOS",
"buildername=Build-Mac-Clang-arm64-Release-iOS",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -8259,102 +8179,6 @@
"isolate": "perf_skia.isolate",
"priority": 0.8
},
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:19"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:33"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:3"
}
],
"dependencies": [
"Build-Mac-Clang-Arm7-Debug-iOS"
],
"dimensions": [
"device:iPad5,1",
"os:iOS-9.3.1",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
"swarm_perf",
"repository=<(REPO)",
"buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:19"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:33"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:3"
}
],
"dependencies": [
"Build-Mac-Clang-Arm7-Release-iOS"
],
"dimensions": [
"device:iPad5,1",
"os:iOS-9.3.1",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
"swarm_perf",
"repository=<(REPO)",
"buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"io_timeout_ns": 2400000000000,
"isolate": "perf_skia.isolate",
"priority": 0.8
},
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
"cipd_packages": [
{
@ -13224,7 +13048,7 @@
"isolate": "test_skia.isolate",
"priority": 0.8
},
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
"Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -13243,7 +13067,7 @@
}
],
"dependencies": [
"Build-Mac-Clang-Arm7-Debug-iOS"
"Build-Mac-Clang-arm-Release-iOS"
],
"dimensions": [
"device:iPad5,1",
@ -13257,55 +13081,7 @@
"../../..",
"swarm_test",
"repository=<(REPO)",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"io_timeout_ns": 2400000000000,
"isolate": "test_skia.isolate",
"priority": 0.8
},
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:19"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:33"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:3"
}
],
"dependencies": [
"Build-Mac-Clang-Arm7-Release-iOS"
],
"dimensions": [
"device:iPad5,1",
"os:iOS-9.3.1",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
"expiration_ns": 72000000000000,
"extra_args": [
"--workdir",
"../../..",
"swarm_test",
"repository=<(REPO)",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@ -14567,35 +14343,6 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
"Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"dependencies": [
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
"gpu:none",
"os:Ubuntu-14.04",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"upload_nano_results",
"repository=<(REPO)",
"buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
"Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
"dependencies": [
"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
@ -17206,9 +16953,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
"dependencies": [
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug"
"Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@ -17221,36 +16968,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
"Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
"dependencies": [
"Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
"gpu:none",
"os:Ubuntu-14.04",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"upload_dm_results",
"repository=<(REPO)",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
"buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",