AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Switch iOS to updated libimobiledevice.

Browse Source 
Bug: skia:9799
Change-Id: I94069d58bde1762ef19122605147bd75232b6ed8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/270446
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Ben Wagner 2020-02-21 10:21:29 -05:00 committed by Skia Commit-Bot
parent 72126aaf5a
commit 828a7ef39d
13 changed files with 1307 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dm/DM.cpp
View File

@ -1581,11 +1581,6 @@ int main(int argc, char** argv) {
info("\t%s\n", gFailures[i].c_str());
}
info("%d failures\n", gFailures.count());
// A non-zero return code does not make it to Swarming
// An abort does.
#ifdef SK_BUILD_FOR_IOS
SK_ABORT("There were failures!");
#endif
return 1;
}

29
infra/bots/gen_tasks_logic/gen_tasks_logic.go
View File

@ -630,9 +630,9 @@ func (b *builder) defaultSwarmDimensions(parts map[string]string) []string {
glog.Fatalf("Entry %q not found in iOS mapping.", parts["model"])
}
d["device_type"] = device
// Temporarily use this dimension to ensure we use the old libimobiledevice until recipes are
// updated.
d["libimobiledevice"] = "1534346785"
// Temporarily use this dimension to ensure we only use the new libimobiledevice, since the
// old version won't work with current recipes.
d["libimobiledevice"] = "1582155448"
} else if strings.Contains(parts["extra_config"], "SKQP") && parts["cpu_or_gpu_value"] == "Emulator" {
if parts["model"] != "NUC7i5BNK" || d["os"] != DEFAULT_OS_DEBIAN {
glog.Fatalf("Please update defaultSwarmDimensions for SKQP::Emulator %s %s.", parts["os"], parts["model"])
@ -1105,6 +1105,27 @@ func usesDocker(t *specs.TaskSpec, name string) {
}
}
var iosRegex = regexp.MustCompile(`os:iOS-(.*)`)
func (b *builder) maybeAddIosDevImage(name string, t *specs.TaskSpec) {
for _, dim := range t.Dimensions {
if m := iosRegex.FindStringSubmatch(dim); len(m) >= 2 {
var asset string
switch m[1] {
// Other patch versions for 11.4 can be added here.
case "11.4.1":
asset = "ios-dev-image-11.4"
default:
glog.Fatalf("Unable to determine correct ios-dev-image asset for %s. If %s is a new iOS release, you must add a CIPD package containing the corresponding iOS dev image; see ios-dev-image-11.4 for an example.", name, m[1])
}
t.CipdPackages = append(t.CipdPackages, b.MustGetCipdPackageFromAsset(asset))
break
} else if strings.Contains(dim, "iOS") {
glog.Fatalf("Must specify iOS version for %s to obtain correct dev image; os dimension is missing version: %s", name, dim)
}
}
}
// timeout sets the timeout(s) for this task.
func timeout(task *specs.TaskSpec, timeout time.Duration) {
task.ExecutionTimeout = timeout
@ -1433,6 +1454,7 @@ func (b *builder) test(name string, parts map[string]string, compileTaskName str
// skia:6737
timeout(task, 6*time.Hour)
}
b.maybeAddIosDevImage(name, task)
b.MustAddTask(name, task)
// Upload results if necessary. TODO(kjlubick): If we do coverage analysis at the same
@ -1512,6 +1534,7 @@ func (b *builder) perf(name string, parts map[string]string, compileTaskName str
if strings.Contains(name, "Android") && strings.Contains(name, "CPU") {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("text_blob_traces"))
}
b.maybeAddIosDevImage(name, task)
iid := b.internalHardwareLabel(parts)
if iid != nil {

568
infra/bots/recipe_modules/flavor/examples/full.expected/ios_rerun_with_debug.json Normal file
View File

@ -0,0 +1,568 @@
[
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"file.txt",
"file.txt"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_file file.txt"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"file.txt"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "cat_file file.txt"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"file.txt"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm file.txt"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
"results_dir"
],
"infra_step": true,
"name": "rmtree results_dir"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"results_dir"
],
"infra_step": true,
"name": "makedirs results_dir"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"device_results_dir"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm device_results_dir"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"device_results_dir"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "mkdir device_results_dir"
},
{
"cmd": [
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/dm.app"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install dm"
},
{
"cmd": [
"ideviceinstaller",
"-i",
"[START_DIR]/build/nanobench.app"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install nanobench"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skia/resources",
"resources"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skia/resources"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skp VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SKP_VERSION@42@@@",
"@@@STEP_LOG_END@SKP_VERSION@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SKP_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "cat_file tmp/SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SKP_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm tmp/SKP_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skps"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skps"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "mkdir skps"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skp",
"skps"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skp"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SKP_VERSION",
"tmp/SKP_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SKP_VERSION"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skimage VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
"infra_step": true,
"name": "write SK_IMAGE_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@",
"@@@STEP_LOG_END@SK_IMAGE_VERSION@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "cat_file tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"images"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"images"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "mkdir images"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/skimage",
"images"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/skimage"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"tmp/SK_IMAGE_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get svg VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@VERSION@42@@@",
"@@@STEP_LOG_END@VERSION@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
"infra_step": true,
"name": "write SVG_VERSION",
"~followup_annotations": [
"@@@STEP_LOG_LINE@SVG_VERSION@42@@@",
"@@@STEP_LOG_END@SVG_VERSION@@@"
]
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SVG_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "cat_file tmp/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SVG_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm tmp/SVG_VERSION"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"svgs"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "rm svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"svgs"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "mkdir svgs"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_if_needed",
"[START_DIR]/svg",
"svgs"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_if_needed [START_DIR]/svg"
},
{
"cmd": [
"[START_DIR]/skia/platform_tools/ios/bin/ios_push_file",
"[START_DIR]/tmp/SVG_VERSION",
"tmp/SVG_VERSION"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "push_file [START_DIR]/tmp/SVG_VERSION"
},
{
"cmd": [
"idevicedebug",
"run",
"com.google.dm",
"--some-flag"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "dm",
"~followup_annotations": [
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[skia::flavor]/resources/ios_debug_cmd.py",
"com.google.dm",
"--some-flag"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "dm with full debug output"
},
{
"failure": {
"failure": {},
"humanReason": "Step('dm') (retcode: 1)"
},
"name": "$result"
}
]

77
infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
View File

@ -90,14 +90,74 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -110,7 +170,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm",
"name": "install dm",
"~followup_annotations": [
"@@@STEP_EXCEPTION@@@"
]
@ -126,7 +186,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "uninstall_dm"
"name": "uninstall dm"
},
{
"cmd": [
@ -139,7 +199,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm (attempt 2)"
"name": "install dm (attempt 2)"
},
{
"cmd": [
@ -152,7 +212,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_nanobench"
"name": "install nanobench"
},
{
"cmd": [
@ -499,10 +559,9 @@
},
{
"cmd": [
"idevice-app-runner",
"-s",
"idevicedebug",
"run",
"com.google.dm",
"--args",
"--some-flag"
],
"env": {

72
infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
View File

@ -90,14 +90,74 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -110,7 +170,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm",
"name": "install dm",
"~followup_annotations": [
"@@@STEP_EXCEPTION@@@"
]
@ -126,7 +186,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "uninstall_dm"
"name": "uninstall dm"
},
{
"cmd": [
@ -139,14 +199,14 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm (attempt 2)",
"name": "install dm (attempt 2)",
"~followup_annotations": [
"@@@STEP_EXCEPTION@@@"
]
},
{
"failure": {
"humanReason": "Infra Failure: Step('install_dm (attempt 2)') (retcode: 1)"
"humanReason": "Infra Failure: Step('install dm (attempt 2)') (retcode: 1)"
},
"name": "$result"
}

12
infra/bots/recipe_modules/flavor/examples/full.py
View File

@ -182,7 +182,7 @@ def GenTests(api):
)
builder = 'Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All'
fail_step_name = 'install_dm'
fail_step_name = 'install dm'
yield (
api.test('retry_ios_install') +
api.properties(buildername=builder,
@ -203,6 +203,16 @@ def GenTests(api):
api.step_data(fail_step_name, retcode=1) +
api.step_data(fail_step_name + ' (attempt 2)', retcode=1)
)
fail_step_name = 'dm'
yield (
api.test('ios_rerun_with_debug') +
api.properties(buildername=builder,
repository='https://skia.googlesource.com/skia.git',
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.step_data(fail_step_name, retcode=1)
)
builder = ('Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All'
'-Android')

79
infra/bots/recipe_modules/flavor/ios.py
View File

@ -28,34 +28,91 @@ class iOSFlavor(default.DefaultFlavor):
tmp_dir='tmp',
texttraces_dir='')
def install(self):
# Set up the device
self.m.run(self.m.step, 'setup_device', cmd=['ios.py'], infra_step=True)
def _run(self, title, *cmd, **kwargs):
def sleep(attempt):
self.m.python.inline('sleep before attempt %d' % attempt, """
import time
time.sleep(2)
""") # pragma: nocover
return self.m.run.with_retry(self.m.step, title, 3, cmd=list(cmd),
between_attempts_fn=sleep, **kwargs)
# Install the app.
def install(self):
# We assume a single device is connected.
# Pair the device.
try:
self.m.run(self.m.step, 'check if device is paired',
cmd=['idevicepair', 'validate'],
infra_step=True, abort_on_failure=True,
fail_build_on_failure=False)
except self.m.step.StepFailure: # pragma: nocover
self._run('pair device', 'idevicepair', 'pair') # pragma: nocover
# Mount developer image.
image_info = self._run('list mounted image',
'ideviceimagemounter', '--list')
image_info_out = image_info.stdout.strip() if image_info.stdout else ''
if ('ImagePresent: true' not in image_info_out and
'ImageSignature:' not in image_info_out):
image_pkgs = self.m.file.glob_paths('locate ios-dev-image package',
self.m.path['start_dir'],
'ios-dev-image*',
test_data=['ios-dev-image-13.2'])
if len(image_pkgs) != 1:
raise Exception('glob for ios-dev-image* returned %s'
% image_pkgs) # pragma: nocover
image_pkg = image_pkgs[0]
contents = self.m.file.listdir(
'locate image and signature', image_pkg,
test_data=['DeveloperDiskImage.dmg',
'DeveloperDiskImage.dmg.signature'])
image = None
sig = None
for f in contents:
if str(f).endswith('.dmg'):
image = f
if str(f).endswith('.dmg.signature'):
sig = f
if not image or not sig:
raise Exception('%s does not contain *.dmg and *.dmg.signature' %
image_pkg) # pragma: nocover
self._run('mount developer image', 'ideviceimagemounter', image, sig)
# Install the apps (necessary before copying any resources to the device).
for app_name in ['dm', 'nanobench']:
app_package = self.host_dirs.bin_dir.join('%s.app' % app_name)
def uninstall_app(attempt):
# If app ID changes, upgrade will fail, so try uninstalling.
self.m.run(self.m.step,
'uninstall_' + app_name,
'uninstall %s' % app_name,
cmd=['ideviceinstaller', '-U', 'com.google.%s' % app_name],
infra_step=True,
# App may not be installed.
abort_on_failure=False, fail_build_on_failure=False)
num_attempts = 2
self.m.run.with_retry(self.m.step, 'install_' + app_name, num_attempts,
self.m.run.with_retry(self.m.step, 'install %s' % app_name, num_attempts,
cmd=['ideviceinstaller', '-i', app_package],
between_attempts_fn=uninstall_app,
infra_step=True)
def step(self, name, cmd, env=None, **kwargs):
bundle_id = 'com.google.%s' % cmd[0]
self.m.run(self.m.step, name,
cmd=['idevice-app-runner', '-s', bundle_id, '--args'] +
map(str, cmd[1:]))
def step(self, name, cmd, **kwargs):
app_name = cmd[0]
bundle_id = 'com.google.%s' % app_name
args = [bundle_id] + map(str, cmd[1:])
success = False
try:
self.m.run(self.m.step, name, cmd=['idevicedebug', 'run'] + args)
success = True
finally:
if not success:
self.m.run(self.m.python, '%s with full debug output' % name,
script=self.module.resource('ios_debug_cmd.py'),
args=args)
def _run_ios_script(self, script, first, *rest):
full = self.m.path['start_dir'].join(

44
infra/bots/recipe_modules/flavor/resources/ios_debug_cmd.py Normal file
View File

@ -0,0 +1,44 @@
#!/usr/bin/env python
# Copyright 2020 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.
import subprocess
import sys
import threading
import time
# Usage: ios_debug_cmd.py <bundle_id> <args...>
# Runs the given app with the given args with full debug output enabled, then
# outputs syslog for the period when the command was running. Exits with the
# exit code of idevicedebug.
bundle_id = sys.argv[1]
args = sys.argv[2:]
logp = subprocess.Popen(['idevicesyslog'], stdout=subprocess.PIPE, bufsize=-1)
log = ''
def collect_log():
global log
while True:
out = logp.stdout.read()
if out:
log = log + out
else:
return
logt = threading.Thread(target=collect_log)
logt.start()
rv = subprocess.call(['idevicedebug', '--debug', 'run', bundle_id] + args)
print('\n\nreturned %d' % rv)
logp.terminate()
print('\n\nreading syslog...')
logt.join()
print('syslog follows')
print(log)
exit(rv)

85
infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All.json
View File

@ -16,7 +16,8 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
@ -25,7 +26,78 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"env": {
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"env": {
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -40,7 +112,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm"
"name": "install dm"
},
{
"cmd": [
@ -55,7 +127,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_nanobench"
"name": "install nanobench"
},
{
"cmd": [
@ -526,10 +598,9 @@
},
{
"cmd": [
"idevice-app-runner",
"-s",
"idevicedebug",
"run",
"com.google.nanobench",
"--args",
"-i",
"resources",
"--skps",

85
infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
View File

@ -16,7 +16,8 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
@ -25,7 +26,78 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"env": {
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"env": {
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.nanobench",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -40,7 +112,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm"
"name": "install dm"
},
{
"cmd": [
@ -55,7 +127,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_nanobench"
"name": "install nanobench"
},
{
"cmd": [
@ -526,10 +598,9 @@
},
{
"cmd": [
"idevice-app-runner",
"-s",
"idevicedebug",
"run",
"com.google.nanobench",
"--args",
"-i",
"resources",
"--skps",

85
infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All.json
View File

@ -16,7 +16,8 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
@ -25,7 +26,78 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"env": {
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"env": {
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -40,7 +112,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm"
"name": "install dm"
},
{
"cmd": [
@ -55,7 +127,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_nanobench"
"name": "install nanobench"
},
{
"cmd": [
@ -627,10 +699,9 @@
},
{
"cmd": [
"idevice-app-runner",
"-s",
"idevicedebug",
"run",
"com.google.dm",
"--args",
"--resourcePath",
"resources",
"--skps",

85
infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
View File

@ -16,7 +16,8 @@
},
{
"cmd": [
"ios.py"
"idevicepair",
"validate"
],
"env": {
"CHROME_HEADLESS": "1",
@ -25,7 +26,78 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "setup_device"
"name": "check if device is paired"
},
{
"cmd": [
"ideviceimagemounter",
"--list"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "list mounted image"
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"glob",
"[START_DIR]",
"ios-dev-image*"
],
"env": {
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate ios-dev-image package",
"~followup_annotations": [
"@@@STEP_LOG_LINE@glob@[START_DIR]/ios-dev-image-13.2@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"listdir",
"[START_DIR]/ios-dev-image-13.2"
],
"env": {
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice"
},
"infra_step": true,
"name": "locate image and signature",
"~followup_annotations": [
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg@@@",
"@@@STEP_LOG_LINE@listdir@[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature@@@",
"@@@STEP_LOG_END@listdir@@@"
]
},
{
"cmd": [
"ideviceimagemounter",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg",
"[START_DIR]/ios-dev-image-13.2/DeveloperDiskImage.dmg.signature"
],
"env": {
"CHROME_HEADLESS": "1",
"IOS_BUNDLE_ID": "com.google.dm",
"IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "mount developer image"
},
{
"cmd": [
@ -40,7 +112,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_dm"
"name": "install dm"
},
{
"cmd": [
@ -55,7 +127,7 @@
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "install_nanobench"
"name": "install nanobench"
},
{
"cmd": [
@ -627,10 +699,9 @@
},
{
"cmd": [
"idevice-app-runner",
"-s",
"idevicedebug",
"run",
"com.google.dm",
"--args",
"--resourcePath",
"resources",
"--skps",

168
infra/bots/tasks.json
View File

@ -24978,6 +24978,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -24998,7 +25003,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25045,6 +25050,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25065,7 +25075,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25112,6 +25122,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25132,7 +25147,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25179,6 +25194,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25199,7 +25219,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25246,6 +25266,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25266,7 +25291,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25313,6 +25338,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25333,7 +25363,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25380,6 +25410,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25400,7 +25435,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -25447,6 +25482,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -25467,7 +25507,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -47993,6 +48033,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48013,7 +48058,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48060,6 +48105,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48080,7 +48130,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48127,6 +48177,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48147,7 +48202,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48194,6 +48249,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48214,7 +48274,7 @@
],
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48261,6 +48321,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48281,7 +48346,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48328,6 +48393,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48348,7 +48418,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48395,6 +48465,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48415,7 +48490,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48462,6 +48537,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48482,7 +48562,7 @@
],
"dimensions": [
"device_type:iPhone7,2",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48529,6 +48609,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48549,7 +48634,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48596,6 +48681,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48616,7 +48706,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48663,6 +48753,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48683,7 +48778,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48730,6 +48825,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48750,7 +48850,7 @@
],
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48797,6 +48897,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48817,7 +48922,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48864,6 +48969,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48884,7 +48994,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48931,6 +49041,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -48951,7 +49066,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],
@ -48998,6 +49113,11 @@
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:c674023879026da0993d36df8c96153cfd31e5a1"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
}
],
"command": [
@ -49018,7 +49138,7 @@
],
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1534346785",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"pool:Skia"
],