AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1351a5954f
skia2/infra/bots
History
Leon Scroggins 1351a5954f Revert "[fuzzer] Remove GL from (now-Vulkan) build" 
This reverts commit 805acda3f3.

Reason for revert: Looks to be breaking the Android roll. See https://android-build.googleplex.com/builds/pending/P29733268/aosp_bramble-userdebug/latest/view/logs/build_error.log

Original change's description:
> [fuzzer] Remove GL from (now-Vulkan) build
>
> The fuzzer runs against the Vulkan version of Swiftshader.
> There are no libGL.so (etc) on the fuzz runtime, so we
> want to avoid linking against those.
>
> The GL code that is #ifdef'd out is still necessary to
> avoid timeouts on TSAN with our NVIDIA jobs.
> https://skia-review.googlesource.com/c/skia/+/502638
>
> Procedure for testing this locally (and iterating):
>   1. In oss-fuzz checkout, run
>      `python infra/helper.py shell skia`
>      to pull up local interactive version of Docker
>      fuzzer build image.
>   2. Run `compile` in fuzzer shell. Stop after
>      the swiftshader compiles and is copied into /out
>      with Ctrl + C.
>   3. Comment out the swiftshader compilation part [1]
>      (no need to re-do this when modifying Skia code).
>      `apt-get install nano -y`
>      `nano ../build.sh`
>   4. Make change to Skia repo using normal methods.
>   5. Run the following in the Skia repo
>      `git diff origin main > foo.patch`
>      Copy the patch into the Docker shell using Ctrl+C
>      and nano.
>   6. Apply the patch inside the Docker shell
>      `git apply foo.patch`
>      and re-compile (which should skip right to
>      building the fuzzer libs)
>      `compile`
>   7. Repeat 4-7 or make small changes directly in
>      the Docker shell via nano.
>   8. When compilation and link succeeds, run
>      `ldd /out/api_mock_gpu_canvas`
>      to verify GL and friends were not dynamically linked.
>
> [1] https://github.com/google/oss-fuzz/pull/7214/files#diff-76f13875e33875cdd372f1f0933206be599cd87952f1bd1eaa57ca928ee9e3e1R49-R53
>
> Change-Id: Idf569820527c1304b0e5a68fd36295be89dfa2a0
> Bug: oss-fuzz:44132
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503016
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>

Bug: oss-fuzz:44132
Change-Id: I3832417c60ff425572717d37dc9609419922b18e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503351
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Brian Osman <brianosman@google.com>
2022-02-03 13:10:09 +00:00
..
analysis A set of scripts that analyzes jobs.json to look for possible holes in our 2021-06-02 16:11:43 +00:00
assets [infra] Update chromebook toolchain to support c++17 2022-01-31 15:46:31 +00:00
buildstats [infra] Cleanup better after BuildStats 2021-08-05 13:22:22 +00:00
gen_tasks_logic Update RecursiveComparison tests to run on GPU. 2022-02-02 19:39:00 +00:00
recipe_modules Revert "[fuzzer] Remove GL from (now-Vulkan) build" 2022-02-03 13:10:09 +00:00
recipes [canvaskit] Fix test search path 2021-12-07 19:43:27 +00:00
task_drivers [canvaskit] Disable dynamic execution 2022-02-01 13:15:22 +00:00
tools/luci-go Fix some master -> main references in docs 2021-09-27 14:52:24 +00:00
build_task_drivers.sh [infra] Move other push task drivers from infra repo 2021-12-09 18:10:54 +00:00
bundle_recipes.sh [python3] Reland recipes -> python3 changes 2021-12-01 13:04:03 +00:00
cfg.json [infra] Make jobs use Gold's public hashes 2021-11-09 17:50:55 +00:00
check_deps.py [recipes] Port to Python 3 2021-11-10 20:17:28 +00:00
gen_tasks.go Reland "[infra] Make most builds idempotent" 2019-07-19 12:11:27 +00:00
git_utils.py [python3] Reland recipes -> python3 changes 2021-12-01 13:04:03 +00:00
infra_tests.py Fix Python3 compatibility 2021-03-25 14:15:35 +00:00
jobs.json Add Pixel 6 phones to the tree. 2022-02-01 14:38:10 +00:00
Makefile Add infra/bots/Makefile to simplify test/train 2017-04-13 17:01:17 +00:00
README.md Update references to master branch 2021-05-21 15:18:16 +00:00
README.recipes.md [python3] Reland recipes -> python3 changes 2021-12-01 13:04:03 +00:00
recipes.py [recipes] Port to Python 3 2021-11-10 20:17:28 +00:00
run_recipe.py Fix Python3 compatibility 2021-03-25 14:15:35 +00:00
tasks.json Update RecursiveComparison tests to run on GPU. 2022-02-02 19:39:00 +00:00
test_utils.py [recipes] Port to Python 3 2021-11-10 20:17:28 +00:00
utils.py [python3] Reland recipes -> python3 changes 2021-12-01 13:04:03 +00:00
zip_utils_test.py Fix Python3 compatibility 2021-03-25 14:15:35 +00:00
zip_utils.py Fix Python3 compatibility 2021-03-25 14:15:35 +00:00

README.md

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 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 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 consistency 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.