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

[infra] Update recipe deps

Browse Source 
Change-Id: Ib0a75da6f9ee4d2cd78dcf67a1d45047264a6001
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398737
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2021-04-20 14:44:27 -04:00 committed by Skia Commit-Bot
parent d0ef90769b
commit 72ca357cf2
26 changed files with 74 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
infra/bots/README.recipes.md
View File

@ -523,18 +523,18 @@ Run the DM test.
&mdash; **def [RunSteps](/infra/bots/recipe_modules/vars/examples/full.py#15)(api):**
[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/343f63643b432ace2d2d4c253c6c327bb18c03ea/recipes/README.recipes.md#recipe_modules-bot_update
[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/343f63643b432ace2d2d4c253c6c327bb18c03ea/recipes/README.recipes.md#recipe_modules-gclient
[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/343f63643b432ace2d2d4c253c6c327bb18c03ea/recipes/README.recipes.md#recipe_modules-git
[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/343f63643b432ace2d2d4c253c6c327bb18c03ea/recipes/README.recipes.md#recipe_modules-tryserver
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/README.recipes.md#recipe_modules-time
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/c89555ad4aad0d235c318a660be9bb34a5d51c60/recipe_engine/recipe_api.py#802
[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4ea67bbd15c5faffad4797a3dadde6d69f5f36fa/recipes/README.recipes.md#recipe_modules-bot_update
[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4ea67bbd15c5faffad4797a3dadde6d69f5f36fa/recipes/README.recipes.md#recipe_modules-gclient
[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4ea67bbd15c5faffad4797a3dadde6d69f5f36fa/recipes/README.recipes.md#recipe_modules-git
[depot_tools/recipe_modules/tryserver]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/4ea67bbd15c5faffad4797a3dadde6d69f5f36fa/recipes/README.recipes.md#recipe_modules-tryserver
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/README.recipes.md#recipe_modules-time
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/91d88f5f33de9779cc396cfe0e8d17edb078a8ab/recipe_engine/recipe_api.py#875

10
infra/bots/recipe_modules/build/examples/full.expected/unknown-docker-image.json
View File

@ -7,18 +7,8 @@
"The recipe has crashed at point 'Uncaught exception'!",
"",
"Traceback (most recent call last):",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps",
" raw_result = recipe_obj.run_steps(api, engine)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
" properties_def, api=api)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",
" arg_names, **additional_args)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties",
" return callable_obj(*props, **additional_args)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/examples/full.py\", line 22, in RunSteps",
" api.build(checkout_root=checkout_root, out_dir=out_dir)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/recipe_api.py\", in _inner",
" return func(*a, **kw)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 57, in __call__",
" self.compile_fn(self.m, checkout_root, out_dir)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 78, in compile_fn",

2
infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json
View File

@ -77,7 +77,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
View File

@ -92,7 +92,7 @@
"cwd": "[START_DIR]/cache/work/flutter",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json
View File

@ -77,7 +77,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

4
infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
View File

@ -13,7 +13,9 @@
"infra_step": true,
"name": "read ssh_machine.json",
"~followup_annotations": [
"@@@STEP_LOG_LINE@ssh_machine.json@{\"user_ip\": \"foo@127.0.0.1\"}@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@{@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@ \"user_ip\": \"foo@127.0.0.1\"@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@}@@@",
"@@@STEP_LOG_END@ssh_machine.json@@@"
]
},

4
infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
View File

@ -13,7 +13,9 @@
"infra_step": true,
"name": "read ssh_machine.json",
"~followup_annotations": [
"@@@STEP_LOG_LINE@ssh_machine.json@{\"user_ip\": \"foo@127.0.0.1\"}@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@{@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@ \"user_ip\": \"foo@127.0.0.1\"@@@",
"@@@STEP_LOG_LINE@ssh_machine.json@}@@@",
"@@@STEP_LOG_END@ssh_machine.json@@@"
]
},

2
infra/bots/recipe_modules/flavor/ssh.py
View File

@ -24,7 +24,7 @@ class SSHFlavor(default.DefaultFlavor):
@property
def user_ip(self):
if not self._user_ip:
path = self.m.path.expanduser('~/ssh_machine.json')
path = self.m.path.expanduser('~')+'/ssh_machine.json'
ssh_info = self.m.file.read_json('read ssh_machine.json', path,
test_data={'user_ip':'foo@127.0.0.1'})
self._user_ip = ssh_info.get(u'user_ip')

44
infra/bots/recipes.py
View File

@ -6,12 +6,12 @@
# We want to run python in unbuffered mode; however shebangs on linux grab the
# entire rest of the shebang line as a single argument, leading to errors like:
#
# /usr/bin/env: 'python -u': No such file or directory
# /usr/bin/env: 'python2 -u': No such file or directory
#
# This little shell hack is a triple-quoted noop in python, but in sh it
# evaluates to re-exec'ing this script in unbuffered mode.
# pylint: disable=pointless-string-statement
''''exec python -u -- "$0" ${1+"$@"} # '''
''''exec python2 -u -- "$0" ${1+"$@"} # '''
# vi: syntax=python
"""Bootstrap script to clone and forward to the recipe engine tool.
@ -25,15 +25,20 @@ To fix bugs, fix in the googlesource repo then run the autoroller.
# pylint: disable=wrong-import-position
import argparse
import errno
import json
import logging
import os
import subprocess
import sys
import urlparse
from collections import namedtuple
try:
import urllib.parse as urlparse
except ImportError:
import urlparse
# The dependency entry for the recipe_engine in the client repo's recipes.cfg
#
# url (str) - the url to the engine repo we want to use.
@ -103,7 +108,9 @@ def parse(repo_root, recipes_cfg_path):
raise MalformedRecipesCfg(ex.message, recipes_cfg_path)
_BAT = '.bat' if sys.platform.startswith(('win', 'cygwin')) else ''
IS_WIN = sys.platform.startswith(('win', 'cygwin'))
_BAT = '.bat' if IS_WIN else ''
GIT = 'git' + _BAT
VPYTHON = 'vpython' + _BAT
CIPD = 'cipd' + _BAT
@ -195,6 +202,13 @@ def checkout_engine(engine_path, repo_root, recipes_cfg_path):
try:
_git_check_call(['diff', '--quiet', revision], cwd=engine_path)
except subprocess.CalledProcessError:
index_lock = os.path.join(engine_path, '.git', 'index.lock')
try:
os.remove(index_lock)
except OSError as exc:
if exc.errno != errno.ENOENT:
logging.warn('failed to remove %r, reset will fail: %s', index_lock,
exc)
_git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path)
# If the engine has refactored/moved modules we need to clean all .pyc files
@ -224,18 +238,26 @@ def main():
repo_root = (
_git_output(['rev-parse', '--show-toplevel'],
cwd=os.path.abspath(os.path.dirname(__file__))).strip())
repo_root = os.path.abspath(repo_root)
repo_root = os.path.abspath(repo_root).decode()
recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg')
args = ['--package', recipes_cfg_path] + args
engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
try:
return _subprocess_call(
[VPYTHON, '-u',
os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
except KeyboardInterrupt:
return 1
argv = (
[VPYTHON, '-u',
os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
if IS_WIN:
# No real 'exec' on windows; set these signals to ignore so that they
# propagate to our children but we still wait for the child process to quit.
import signal
signal.signal(signal.SIGBREAK, signal.SIG_IGN)
signal.signal(signal.SIGINT, signal.SIG_IGN)
signal.signal(signal.SIGTERM, signal.SIG_IGN)
return _subprocess_call(argv)
else:
os.execvp(argv[0], argv)
if __name__ == '__main__':

2
infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/compute_buildstats.expected/normal_bot.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

4
infra/bots/recipes/compute_buildstats.expected/trybot.json
View File

@ -77,7 +77,7 @@
},
"infra_step": true,
"name": "gerrit fetch current CL info",
"timeout": 600,
"timeout": 60,
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
@ -123,7 +123,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -77,7 +77,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

248
infra/bots/recipes/perf_canvaskit.expected/Perf-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit.json
View File

@ -1,248 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
],
"name": "get swarming bot id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [],
"name": "Docker setup"
},
{
"cmd": [
"python",
"-u",
"import os\nprint '%d:%d' % (os.getuid(), os.getgid())\n"
],
"name": "Docker setup.Get uid and gid",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print '%d:%d' % (os.getuid(), os.getgid())@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "Docker setup.mkdirs out_dir",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "Docker setup.chmod 777 [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"755",
"[START_DIR]"
],
"infra_step": true,
"name": "Docker setup.chmod 755 [START_DIR]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"0755",
"[START_DIR]/skia/infra/canvaskit/perf_canvaskit.sh"
],
"infra_step": true,
"name": "Docker setup.chmod 0755 [START_DIR]/skia/infra/canvaskit/perf_canvaskit.sh",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin"
],
"infra_step": true,
"name": "Docker setup.mkdirs [START_DIR]/skia/modules/canvaskit/npm_build/bin",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/build/canvaskit.wasm",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm"
],
"infra_step": true,
"name": "Docker setup.cp [START_DIR]/build/canvaskit.wasm [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"644",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm"
],
"infra_step": true,
"name": "Docker setup.chmod 644 [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin"
],
"infra_step": true,
"name": "Docker setup.mkdirs [START_DIR]/skia/modules/canvaskit/npm_build/bin (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/build/canvaskit.js",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js"
],
"infra_step": true,
"name": "Docker setup.cp [START_DIR]/build/canvaskit.js [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"644",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js"
],
"infra_step": true,
"name": "Docker setup.chmod 644 [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"-R",
"a+r",
"[START_DIR]/skia"
],
"infra_step": true,
"name": "Docker setup.chmod -R a+r [START_DIR]/skia",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"docker",
"run",
"--shm-size=2gb",
"--rm",
"--user",
"13:17",
"--mount",
"type=bind,source=[START_DIR],target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/[SWARM_OUT_DIR],target=/OUT",
"gcr.io/skia-public/perf-karma-chrome-tests:87.0.4280.88_v1",
"/SRC/skia/infra/canvaskit/perf_canvaskit.sh",
"--builder",
"Perf-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit",
"--git_hash",
"abc123",
"--buildbucket_build_id",
"",
"--bot_id",
"",
"--task_id",
"",
"--browser",
"Chrome",
"--config",
"Release",
"--source_type",
"canvaskit"
],
"env": {
"CHROME_HEADLESS": "1",
"DOCKER_CONFIG": "/home/chrome-bot/.docker",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "Performance tests of CanvasKit with Docker"
},
{
"name": "$result"
}
]

252
infra/bots/recipes/perf_canvaskit.expected/pathkit_trybot.json
View File

@ -1,252 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
],
"name": "get swarming bot id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [],
"name": "Docker setup"
},
{
"cmd": [
"python",
"-u",
"import os\nprint '%d:%d' % (os.getuid(), os.getgid())\n"
],
"name": "Docker setup.Get uid and gid",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print '%d:%d' % (os.getuid(), os.getgid())@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "Docker setup.mkdirs out_dir",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "Docker setup.chmod 777 [START_DIR]/[SWARM_OUT_DIR]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"755",
"[START_DIR]"
],
"infra_step": true,
"name": "Docker setup.chmod 755 [START_DIR]",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"0755",
"[START_DIR]/skia/infra/canvaskit/perf_canvaskit.sh"
],
"infra_step": true,
"name": "Docker setup.chmod 0755 [START_DIR]/skia/infra/canvaskit/perf_canvaskit.sh",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin"
],
"infra_step": true,
"name": "Docker setup.mkdirs [START_DIR]/skia/modules/canvaskit/npm_build/bin",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/build/canvaskit.wasm",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm"
],
"infra_step": true,
"name": "Docker setup.cp [START_DIR]/build/canvaskit.wasm [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"644",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm"
],
"infra_step": true,
"name": "Docker setup.chmod 644 [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.wasm",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin"
],
"infra_step": true,
"name": "Docker setup.mkdirs [START_DIR]/skia/modules/canvaskit/npm_build/bin (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"vpython",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/build/canvaskit.js",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js"
],
"infra_step": true,
"name": "Docker setup.cp [START_DIR]/build/canvaskit.js [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"644",
"[START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js"
],
"infra_step": true,
"name": "Docker setup.chmod 644 [START_DIR]/skia/modules/canvaskit/npm_build/bin/canvaskit.js",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"chmod",
"-R",
"a+r",
"[START_DIR]/skia"
],
"infra_step": true,
"name": "Docker setup.chmod -R a+r [START_DIR]/skia",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"docker",
"run",
"--shm-size=2gb",
"--rm",
"--user",
"13:17",
"--mount",
"type=bind,source=[START_DIR],target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/[SWARM_OUT_DIR],target=/OUT",
"gcr.io/skia-public/perf-karma-chrome-tests:87.0.4280.88_v1",
"/SRC/skia/infra/canvaskit/perf_canvaskit.sh",
"--builder",
"Perf-Debian10-EMCC-GCE-GPU-AVX2-wasm-Release-All-CanvasKit",
"--git_hash",
"abc123",
"--buildbucket_build_id",
"",
"--bot_id",
"",
"--task_id",
"",
"--browser",
"Chrome",
"--config",
"Release",
"--source_type",
"canvaskit",
"--issue",
"1234",
"--patchset",
"7"
],
"env": {
"CHROME_HEADLESS": "1",
"DOCKER_CONFIG": "/home/chrome-bot/.docker",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "Performance tests of CanvasKit with Docker"
},
{
"name": "$result"
}
]

8
infra/bots/recipes/perf_skottiewasm_lottieweb.expected/unrecognized_builder.json
View File

@ -27,14 +27,6 @@
"The recipe has crashed at point 'Uncaught exception'!",
"",
"Traceback (most recent call last):",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps",
" raw_result = recipe_obj.run_steps(api, engine)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps",
" properties_def, api=api)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",
" arg_names, **additional_args)",
" File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties",
" return callable_obj(*props, **additional_args)",
" File \"RECIPE_REPO[skia]/infra/bots/recipes/perf_skottiewasm_lottieweb.py\", line 127, in RunSteps",
" raise Exception('Could not recognize the buildername %s' % buildername)",
"Exception: Could not recognize the buildername Perf-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-Unrecognized"

2
infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_DryRun.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/recreate_skps.expected/failed_upload.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-Flutter_Android.json
View File

@ -90,7 +90,7 @@
"cwd": "[START_DIR]/cache/work/flutter",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-universal-devrel-Android_SKQP.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

2
infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
View File

@ -75,7 +75,7 @@
"cwd": "[START_DIR]/cache/work",
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "300"
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [

4
infra/config/recipes.cfg
View File

@ -14,12 +14,12 @@
"deps": {
"depot_tools": {
"branch": "master",
"revision": "343f63643b432ace2d2d4c253c6c327bb18c03ea",
"revision": "4ea67bbd15c5faffad4797a3dadde6d69f5f36fa",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"recipe_engine": {
"branch": "master",
"revision": "c89555ad4aad0d235c318a660be9bb34a5d51c60",
"revision": "91d88f5f33de9779cc396cfe0e8d17edb078a8ab",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},