17fbcd145b
This CL fixes a bug in the logic that checks whether there's an image mounted on the attached iOS device. Currently this is determined by checking whether strings "ImagePresent: true" or "ImageSignature:" are present in the output of command "ideviceimagemounter --list". However, these strings do not match the command's actual output: # No image mounted. $ ideviceimagemounter --list Status: Complete # Image mounted (fake signature for illustrative purposes). $ ideviceimagemounter --list ImageSignature[1]: 0: Rm9yIGlsbHVzdHJhdGl2ZSBwdXJwb3NlcyBvbmx5LiBUaGlzIGlzIG5vdCBhIHJlYWwgc2lnbmF0dXJlLg== Status: Complete As is, the recipe fails to detect that an image is already mounted on the attached iOS device. The recipe then tries to mount one, which makes the "ideviceimagemounter" command fail with "Error: ImageAlreadyMounted". The following example shows how to reproduce this error: # Initially no image is mounted. $ ideviceimagemounter --list Status: Complete # Mount an image. $ ideviceimagemounter DeveloperDiskImage.dmg DeveloperDiskImage.dmg.signature Uploading DeveloperDiskImage.dmg done. Mounting... Done. Status: Complete # Verify that the image is mounted. $ ideviceimagemounter --list ImageSignature[1]: 0: Rm9yIGlsbHVzdHJhdGl2ZSBwdXJwb3NlcyBvbmx5LiBUaGlzIGlzIG5vdCBhIHJlYWwgc2lnbmF0dXJlLg== Status: Complete # Try to mount an image when one is already mounted. $ ideviceimagemounter DeveloperDiskImage.dmg DeveloperDiskImage.dmg.signature Uploading DeveloperDiskImage.dmg done. Mounting... Error: ImageMountFailed Checking for presence of string "ImageSignature" in the ideviceimagemounter command's output seems to solve the problem. In the process I also discovered that self._run() requires keyword argument stdout=self.m.raw_io.output() in order to return the command's output. As is, the returned stdout is always blank. Note to reviewer: - Patchsets 1 to 11 iterate on a potential fix. - Patchset 12 reproduces the bug. See the failing tryjob. - Patchset 13 tries the fix. See the successful tryjob. - Patchsets 14+ clean up the CL. Change-Id: I3ca1cdbf4bfa450c3e87d6d87b5f615f28c4aaba Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281058 Reviewed-by: Weston Tracey <westont@google.com> Commit-Queue: Leandro Lovisolo <lovisolo@google.com> |
||
---|---|---|
.. | ||
android_compile | ||
assets | ||
buildstats | ||
g3_compile | ||
gen_tasks_logic | ||
recipe_modules | ||
recipes | ||
tools/luci-go | ||
assets.isolate | ||
build_task_drivers.sh | ||
bundle_recipes.sh | ||
calmbench.isolate | ||
canvaskit.isolate | ||
cfg.json | ||
check_deps.py | ||
compile_android_framework.isolate | ||
compile_g3_framework.isolate | ||
compile.isolate | ||
empty.isolate | ||
gen_compile_isolate.py | ||
gen_tasks.go | ||
git_utils.py | ||
infra_tests.isolate | ||
infra_tests.py | ||
infrabots.isolate | ||
ios_bin.isolate | ||
isolate_android_sdk_linux.isolate | ||
isolate_gcloud_linux.isolate | ||
isolate_go.isolate | ||
jobs.json | ||
lottie_web.isolate | ||
Makefile | ||
OWNERS | ||
pathkit.isolate | ||
perf_skia_bundled.isolate | ||
README.md | ||
recipes.isolate | ||
recipes.py | ||
resources.isolate | ||
run_recipe.isolate | ||
run_recipe.py | ||
skottie_wasm.isolate | ||
skpbench_skia_bundled.isolate | ||
skqp.isolate | ||
swarm_recipe.isolate | ||
task_drivers.isolate | ||
tasks.json | ||
test_skia_bundled.isolate | ||
test_utils.py | ||
update_meta_config.py | ||
upload_skps.py | ||
utils.py | ||
zip_utils_test.py | ||
zip_utils.py |
Skia Infrastructure
This directory contains infrastructure elements.
Tasks and Jobs
Files in this directory define a DAG of tasks which run at every Skia commit. A task is a small, self-contained unit which runs via Swarming on a machine in the pool. Tasks may be chained together, eg. one task to compile test binaries and another to actually run them.
Jobs are collections of related tasks which help define sub-sections of the DAG, for example, to be used as try jobs. Each job is defined as an entry point into the DAG.
The tasks.json file in this directory is the master list of tasks and jobs for the repo. Note that tasks.json is NEVER edited by hand but generated via gen_task.go and the input files enumerated below. The Task Scheduler reads the tasks.json file at each commit to determine which jobs to run. For convenience, gen_tasks.go is provided to generate tasks.json and also to test it for correct syntax and detecting cycles and orphaned tasks. Always edit gen_tasks.go or one of the following input JSON files, rather than tasks.json itself:
- cfg.json - Basic configuration information for gen_tasks.go.
- jobs.json - The master list of all jobs to run. Edit this to add or remove bots.
Whenever gen_tasks.go, any of the above JSON files, or assets are changed, you need to run gen_tasks.go to regenerate tasks.json:
$ go run infra/bots/gen_tasks.go
Or:
$ cd infra/bots; make train
There is also a test mode which performs sanity-checks and verifies that tasks.json is unchanged:
$ go run infra/bots/gen_tasks.go --test
Or:
$ cd infra/bots; make test
Recipes
Recipes are the framework used by Skia's infrastructure to perform work inside of Swarming tasks. The main elements are:
- recipes.py - Used for running and testing recipes.
- recipes - These are the entry points for each type of task, eg. compiling or running tests.
- recipe_modules - Shared modules which are used by recipes.
- .recipe_deps - Recipes and modules may depend on modules from other repos. The recipes.py script automatically syncs those dependencies in this directory.
Isolate Files
These files determine which parts of the repository are transferred to the bot when a Swarming task is triggered. The Isolate tool hashes each file and will upload any new/changed files. Bots maintain a cache so that they can efficiently download only the files they don't have.
Assets
Artifacts used by the infrastructure are versioned here, along with scripts for recreating/uploading/downloading them. See the README in that directory for more information. Any time an asset used by the bots changes, you need to re-run gen_tasks.go.
Tools
Assorted other infrastructure-related tools, eg. isolate and CIPD binaries.
CT
Helpers for running Skia tasks in Cluster Telemetry.