diff --git a/PRESUBMIT.py b/PRESUBMIT.py index bd88c0a3a0..3f177e5e36 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -192,28 +192,6 @@ def _CheckGNFormatted(input_api, output_api): return results -def _CheckCompileIsolate(input_api, output_api): - """Ensure that gen_compile_isolate.py does not change compile.isolate.""" - # Only run the check if files were added or removed. - results = [] - script = os.path.join('infra', 'bots', 'gen_compile_isolate.py') - isolate = os.path.join('infra', 'bots', 'compile.isolated') - for f in input_api.AffectedFiles(): - if f.Action() in ('A', 'D', 'R'): - break - if f.LocalPath() in (script, isolate): - break - else: - return results - - cmd = ['python', script, 'test'] - try: - subprocess.check_output(cmd, stderr=subprocess.STDOUT) - except subprocess.CalledProcessError as e: - results.append(output_api.PresubmitError(e.output)) - return results - - class _WarningsAsErrors(): def __init__(self, output_api): self.output_api = output_api @@ -250,7 +228,6 @@ def _CommonChecks(input_api, output_api): results.extend(_CopyrightChecks(input_api, output_api, source_file_filter=sources)) results.extend(_ToolFlags(input_api, output_api)) - results.extend(_CheckCompileIsolate(input_api, output_api)) return results diff --git a/infra/bots/compile.isolate b/infra/bots/compile.isolate deleted file mode 100644 index a0907047e2..0000000000 --- a/infra/bots/compile.isolate +++ /dev/null @@ -1,47 +0,0 @@ -{ - 'includes': [ - 'run_recipe.isolate', - ], - 'variables': { - 'files': [ - '../../../.gclient', - '../../.clang-format', - '../../.clang-tidy', - '../../.gn', - '../../BUILD.gn', - '../../bench', - '../../bin/fetch-clang-format', - '../../bin/fetch-gn', - '../../buildtools', - '../../dm', - '../../docs/examples', - '../../example', - '../../experimental', - '../../fuzz', - '../../gm', - '../../gn', - '../../include', - '../../modules', - '../../platform_tools/android/apps/arcore/src/main/cpp', - '../../platform_tools/android/apps/skottie/src/main/cpp', - '../../platform_tools/android/launcher/skia_launcher.cpp', - '../../platform_tools/android/vulkan/Skia_Vulkan_Android.h', - '../../platform_tools/libraries/include/arcore_c_api.h', - '../../resources', - '../../samplecode', - '../../src', - '../../tests', - '../../third_party', - '../../tools', - '../canvaskit', - '../pathkit', - 'assets/android_ndk_darwin/VERSION', - 'assets/android_ndk_linux/VERSION', - 'assets/android_ndk_windows/VERSION', - 'assets/cast_toolchain/VERSION', - 'assets/clang_linux/VERSION', - 'assets/clang_win/VERSION', - 'assets/mips64el_toolchain_linux/VERSION', - ], - }, -} diff --git a/infra/bots/gen_compile_isolate.py b/infra/bots/gen_compile_isolate.py deleted file mode 100644 index 933bf7c5c6..0000000000 --- a/infra/bots/gen_compile_isolate.py +++ /dev/null @@ -1,233 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2019 Google LLC -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -import difflib -import os -import re -import subprocess -import sys - - -# Any files in Git which match these patterns will be included, either directly -# or indirectly via a parent dir. -PATH_PATTERNS = [ - r'.*\.c$', - r'.*\.cc$', - r'.*\.cpp$', - r'.*\.gn$', - r'.*\.gni$', - r'.*\.h$', -] - -# These paths are always added to the inclusion list. Note that they may not -# appear in the isolate if they are included indirectly via a parent dir. -EXPLICIT_PATHS = [ - '../.gclient', - '.clang-format', - '.clang-tidy', - 'bin/fetch-clang-format', - 'bin/fetch-gn', - 'buildtools', - 'infra/bots/assets/android_ndk_darwin/VERSION', - 'infra/bots/assets/android_ndk_linux/VERSION', - 'infra/bots/assets/android_ndk_windows/VERSION', - 'infra/bots/assets/cast_toolchain/VERSION', - 'infra/bots/assets/clang_linux/VERSION', - 'infra/bots/assets/clang_win/VERSION', - 'infra/bots/assets/mips64el_toolchain_linux/VERSION', - 'infra/canvaskit', - 'infra/pathkit', - 'resources', - 'third_party/externals', -] - -# If a parent path contains more than this many immediate child paths (ie. files -# and dirs which are directly inside it as opposed to indirect descendants), we -# will include the parent in the isolate file instead of the children. This -# results in a simpler isolate file which should need to be changed less often. -COMBINE_PATHS_THRESHOLD = 3 - -# Template for the isolate file content. -ISOLATE_TMPL = '''{ - 'includes': [ - 'run_recipe.isolate', - ], - 'variables': { - 'files': [ -%s - ], - }, -} -''' - -# Absolute path to the infra/bots dir. -INFRABOTS_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__))) - -# Absolute path to the compile.isolate file. -ISOLATE_FILE = os.path.join(INFRABOTS_DIR, 'compile.isolate') - - -def all_paths(): - """Return all paths which are checked in to git.""" - repo_root = os.path.abspath(os.path.join(INFRABOTS_DIR, os.pardir, os.pardir)) - output = subprocess.check_output(['git', 'ls-files'], cwd=repo_root).rstrip() - return output.splitlines() - - -def get_relevant_paths(): - """Return all checked-in paths in PATH_PATTERNS or EXPLICIT_PATHS.""" - paths = [] - for f in all_paths(): - for regexp in PATH_PATTERNS: - if re.match(regexp, f): - paths.append(f) - break - - paths.extend(EXPLICIT_PATHS) - return paths - - -class Tree(object): - """Tree helps with deduplicating and collapsing paths.""" - class Node(object): - """Node represents an individual node in a Tree.""" - def __init__(self, name): - self._children = {} - self._name = name - self._is_leaf = False - - @property - def is_root(self): - """Return True iff this is the root node.""" - return self._name is None - - def add(self, entry): - """Add the given entry (given as a list of strings) to the Node.""" - # Remove the first element if we're not the root node. - if not self.is_root: - if entry[0] != self._name: - raise ValueError('Cannot add a non-matching entry to a Node!') - entry = entry[1:] - - # If the entry is now empty, this node is a leaf. - if not entry: - self._is_leaf = True - return - - # Add a child node. - if not self._is_leaf: - child = self._children.get(entry[0]) - if not child: - child = Tree.Node(entry[0]) - self._children[entry[0]] = child - child.add(entry) - - # If we have more than COMBINE_PATHS_THRESHOLD immediate children, - # combine them into this node. - immediate_children = 0 - for child in self._children.itervalues(): - if child._is_leaf: - immediate_children += 1 - if not self.is_root and immediate_children >= COMBINE_PATHS_THRESHOLD: - self._is_leaf = True - self._children = {} - - def entries(self): - """Return the entries represented by this node and its children. - - Will not return children in the following cases: - - This Node is a leaf, ie. it represents an entry which was explicitly - inserted into the Tree, as opposed to only part of a path to other - entries. - - This Node has immediate children exceeding COMBINE_PATHS_THRESHOLD and - thus has been upgraded to a leaf node. - """ - if self._is_leaf: - return [self._name] - rv = [] - for child in self._children.itervalues(): - for entry in child.entries(): - if not self.is_root: - entry = self._name + '/' + entry - rv.append(entry) - return rv - - def __init__(self): - self._root = Tree.Node(None) - - def add(self, entry): - """Add the given entry to the tree.""" - split = entry.split('/') - if split[-1] == '': - split = split[:-1] - self._root.add(split) - - def entries(self): - """Return the list of entries in the tree. - - Entries will be de-duplicated as follows: - - Any entry which is a sub-path of another entry will not be returned. - - Any entry which was not explicitly inserted but has children exceeding - the COMBINE_PATHS_THRESHOLD will be returned while its children will not - be returned. - """ - return self._root.entries() - - -def relpath(repo_path): - """Return a relative path to the given path within the repo. - - The path is relative to the infra/bots dir, where the compile.isolate file - lives. - """ - repo_path = '../../' + repo_path - repo_path = repo_path.replace('../../infra/', '../') - repo_path = repo_path.replace('../bots/', '') - return repo_path - - -def get_isolate_content(paths): - """Construct the new content of the isolate file based on the given paths.""" - lines = [' \'%s\',' % relpath(p) for p in paths] - lines.sort() - return ISOLATE_TMPL % '\n'.join(lines) - - -def main(): - """Regenerate the compile.isolate file, or verify that it hasn't changed.""" - testing = False - if len(sys.argv) == 2 and sys.argv[1] == 'test': - testing = True - elif len(sys.argv) != 1: - print >> sys.stderr, 'Usage: %s [test]' % sys.argv[0] - sys.exit(1) - - tree = Tree() - for p in get_relevant_paths(): - tree.add(p) - content = get_isolate_content(tree.entries()) - - if testing: - with open(ISOLATE_FILE, 'rb') as f: - expect_content = f.read() - if content != expect_content: - print >> sys.stderr, 'Found diff in %s:' % ISOLATE_FILE - a = expect_content.splitlines() - b = content.splitlines() - diff = difflib.context_diff(a, b, lineterm='') - for line in diff: - sys.stderr.write(line + '\n') - print >> sys.stderr, 'You may need to run:\n\n\tpython %s' % sys.argv[0] - sys.exit(1) - else: - with open(ISOLATE_FILE, 'wb') as f: - f.write(content) - - -if __name__ == '__main__': - main() diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 6e02bfd0f5..dda9a0b541 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -12,7 +12,6 @@ import ( "go.skia.org/skia/infra/bots/gen_tasks_logic" ) -// Regenerate the tasks.json file. func main() { gen_tasks_logic.GenTasks(nil) } diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go index b3e12138a3..e38bd9f7cc 100644 --- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go +++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go @@ -997,26 +997,8 @@ func attempts(name string) int { // compile generates a compile task. Returns the name of the last task in the // generated chain of tasks, which the Job should add as a dependency. func (b *builder) compile(name string, parts map[string]string) string { - recipe := "compile" - isolate := "compile.isolate" - var props map[string]string - needSync := false - if strings.Contains(name, "NoDEPS") || - strings.Contains(name, "CMake") || - strings.Contains(name, "CommandBuffer") || - strings.Contains(name, "Flutter") || - strings.Contains(name, "ParentRevision") { - recipe = "sync_and_compile" - isolate = "swarm_recipe.isolate" - props = EXTRA_PROPS - needSync = true - } - task := b.kitchenTask(name, recipe, isolate, b.cfg.ServiceAccountCompile, b.swarmDimensions(parts), props, OUTPUT_BUILD) - if needSync { - b.usesGit(task, name) - } else { - task.Idempotent = true - } + task := b.kitchenTask(name, "compile", "swarm_recipe.isolate", b.cfg.ServiceAccountCompile, b.swarmDimensions(parts), EXTRA_PROPS, OUTPUT_BUILD) + b.usesGit(task, name) usesDocker(task, name) // Android bots require a toolchain. diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json index b24739533c..4b1b25643b 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json @@ -1,4 +1,113 @@ [ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/cache/work" + ], + "infra_step": true, + "name": "makedirs checkout_path" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", + "[START_DIR]/cache/work/.gclient_entries" + ], + "infra_step": true, + "name": "remove [START_DIR]/cache/work/.gclient_entries" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec-path", + "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"got_revision\": \"skia\"}", + "--git-cache-dir", + "[START_DIR]/cache/git", + "--cleanup-dir", + "[CLEANUP]/bot_update", + "--output_json", + "/path/to/tmp/json", + "--revision", + "skia@abc123" + ], + "cwd": "[START_DIR]/cache/work", + "env_prefixes": { + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, + "infra_step": true, + "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@ \"source_manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"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@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@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": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/tmp" + ], + "infra_step": true, + "name": "makedirs tmp_dir" + }, { "cmd": [ "python", @@ -22,7 +131,7 @@ "--workdir", "/SRC/skia/infra/skqp", "--volume", - "[START_DIR]:/SRC", + "[START_DIR]/cache/work:/SRC", "--volume", "[START_DIR]/cache/docker/skqp:/OUT", "gcr.io/skia-public/android-skqp:r20_v1", @@ -122,7 +231,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/skia/infra/cts/whitelist_devices.json", + "[START_DIR]/cache/work/skia/infra/cts/whitelist_devices.json", "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json similarity index 64% rename from infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json rename to infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json index 2b0e49b010..ded9cdc809 100644 --- a/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json @@ -3,9 +3,9 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]\\resources\\git_setup.py", + "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", "--path", - "[START_DIR]\\skia", + "[START_DIR]/skia", "--url", "https://skia.googlesource.com/skia.git" ], @@ -20,9 +20,9 @@ "abc123", "--progress" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "env": { - "PATH": "RECIPE_REPO[depot_tools];" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -34,7 +34,7 @@ "-f", "FETCH_HEAD" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "infra_step": true, "name": "git checkout" }, @@ -44,7 +44,7 @@ "rev-parse", "HEAD" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "infra_step": true, "name": "read revision", "~followup_annotations": [ @@ -59,7 +59,7 @@ "-d", "-x" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "infra_step": true, "name": "git clean" }, @@ -67,13 +67,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", "ensure-directory", "--mode", "0777", - "[START_DIR]\\tmp" + "[START_DIR]/tmp" ], "infra_step": true, "name": "makedirs tmp_dir" @@ -82,41 +82,41 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]/skia/infra/bots/assets/clang_linux/VERSION", "/path/to/tmp/" ], "infra_step": true, - "name": "Get clang_win VERSION" + "name": "Get clang_linux VERSION" }, { "cmd": [ "python", "-u", - "[START_DIR]\\skia\\bin\\fetch-gn" + "[START_DIR]/skia/bin/fetch-gn" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "env": { "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_REPO[depot_tools]" + "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, "name": "fetch-gn" }, { "cmd": [ - "[START_DIR]\\skia\\bin\\gn", + "[START_DIR]/skia/bin/gn", "gen", - "[START_DIR]\\skia\\out\\Build-Win10-Clang-x86_64-Release-NoDEPS\\Release_x64", - "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false is_official_build=true skia_enable_fontmgr_empty=true skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_freetype=false skia_use_harfbuzz=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_vulkan=false skia_use_zlib=false target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\"" + "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release", + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false is_official_build=true skia_enable_fontmgr_empty=true skia_enable_gpu=true skia_enable_pdf=false skia_use_expat=false skia_use_freetype=false skia_use_harfbuzz=false skia_use_libjpeg_turbo=false skia_use_libpng=false skia_use_libwebp=false skia_use_vulkan=false skia_use_zlib=false target_cpu=\"x86_64\" werror=true" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "env": { "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_REPO[depot_tools]" + "PATH": ":RECIPE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -124,12 +124,12 @@ "cmd": [ "ninja", "-C", - "[START_DIR]\\skia\\out\\Build-Win10-Clang-x86_64-Release-NoDEPS\\Release_x64" + "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]/skia", "env": { "CHROME_HEADLESS": "1", - "PATH": ";RECIPE_REPO[depot_tools]" + "PATH": ":RECIPE_REPO[depot_tools]" }, "name": "ninja" }, @@ -138,8 +138,8 @@ "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', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\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", - "[START_DIR]\\skia\\out\\Build-Win10-Clang-x86_64-Release-NoDEPS\\Release_x64", - "[START_DIR]\\[SWARM_OUT_DIR]" + "[START_DIR]/skia/out/Build-Debian9-Clang-x86_64-Release-NoDEPS/Release", + "[START_DIR]/[SWARM_OUT_DIR]" ], "infra_step": true, "name": "copy build products", @@ -171,25 +171,6 @@ "@@@STEP_LOG_END@python.inline@@@" ] }, - { - "cmd": [ - "python", - "-u", - "import psutil\nfor p in psutil.process_iter():\n try:\n if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):\n p.kill()\n except psutil._error.AccessDenied:\n pass\n" - ], - "infra_step": true, - "name": "cleanup", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import psutil@@@", - "@@@STEP_LOG_LINE@python.inline@for p in psutil.process_iter():@@@", - "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):@@@", - "@@@STEP_LOG_LINE@python.inline@ p.kill()@@@", - "@@@STEP_LOG_LINE@python.inline@ except psutil._error.AccessDenied:@@@", - "@@@STEP_LOG_LINE@python.inline@ pass@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, { "name": "$result" } diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json similarity index 100% rename from infra/bots/recipes/sync_and_compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json rename to infra/bots/recipes/compile.expected/Build-Debian9-Clang-x86_64-Release-ParentRevision.json diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json similarity index 100% rename from infra/bots/recipes/sync_and_compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json rename to infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json similarity index 100% rename from infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json rename to infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index 6cbc752c1a..f2b7e88991 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -1,4 +1,113 @@ [ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\cache\\work" + ], + "infra_step": true, + "name": "makedirs checkout_path" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", + "[START_DIR]\\cache\\work\\.gclient_entries" + ], + "infra_step": true, + "name": "remove [START_DIR]\\cache\\work\\.gclient_entries" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", + "--spec-path", + "cache_dir = '[START_DIR]\\\\cache\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"got_revision\": \"skia\"}", + "--git-cache-dir", + "[START_DIR]\\cache\\git", + "--cleanup-dir", + "[CLEANUP]\\bot_update", + "--output_json", + "/path/to/tmp/json", + "--revision", + "skia@abc123" + ], + "cwd": "[START_DIR]\\cache\\work", + "env_prefixes": { + "PATH": [ + "RECIPE_REPO[depot_tools]" + ] + }, + "infra_step": true, + "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@ \"source_manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"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@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@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": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]\\tmp" + ], + "infra_step": true, + "name": "makedirs tmp_dir" + }, { "cmd": [ "python", @@ -7,7 +116,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]\\skia\\infra\\bots\\assets\\clang_win\\VERSION", + "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION", "/path/to/tmp/" ], "infra_step": true, @@ -17,9 +126,9 @@ "cmd": [ "python", "-u", - "[START_DIR]\\skia\\bin\\fetch-gn" + "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "CHROME_HEADLESS": "1", "PATH": ";RECIPE_REPO[depot_tools]" @@ -29,12 +138,12 @@ }, { "cmd": [ - "[START_DIR]\\skia\\bin\\gn", + "[START_DIR]\\cache\\work\\skia\\bin\\gn", "gen", "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug", "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\"" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "CHROME_HEADLESS": "1", "PATH": ";RECIPE_REPO[depot_tools]" @@ -47,7 +156,7 @@ "-C", "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug" ], - "cwd": "[START_DIR]\\skia", + "cwd": "[START_DIR]\\cache\\work\\skia", "env": { "CHROME_HEADLESS": "1", "PATH": ";RECIPE_REPO[depot_tools]" diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index eee5863f99..cb25205c26 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -25,15 +25,53 @@ DEPS = [ def RunSteps(api): api.vars.setup() - checkout_root = api.path['start_dir'] - out_dir = api.vars.cache_dir.join( - 'work', 'skia', 'out', api.vars.builder_name, api.vars.configuration) + # Check out code. + bot_update = True + checkout_root = api.checkout.default_checkout_root + checkout_chromium = False + checkout_flutter = False + extra_gclient_env = {} + flutter_android = False + parent_rev = False + + if 'NoDEPS' in api.properties['buildername']: + bot_update = False + checkout_root = api.path['start_dir'] + if 'CommandBuffer' in api.vars.builder_name: + checkout_chromium = True + if 'Flutter' in api.vars.builder_name: + checkout_root = checkout_root.join('flutter') + checkout_flutter = True + if 'Android' in api.vars.builder_name: + flutter_android = True + if 'ParentRevision' in api.vars.builder_name: + parent_rev = True + + if bot_update: + api.checkout.bot_update( + checkout_root=checkout_root, + checkout_chromium=checkout_chromium, + checkout_flutter=checkout_flutter, + extra_gclient_env=extra_gclient_env, + flutter_android=flutter_android, + parent_rev=parent_rev) + else: + api.checkout.git(checkout_root=checkout_root) + + api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir) + + out_dir = checkout_root.join( + 'skia', 'out', api.vars.builder_name, api.vars.configuration) + if 'Flutter' in api.vars.builder_name: + out_dir = checkout_root.join('src', 'out', 'android_release') try: api.build(checkout_root=checkout_root, out_dir=out_dir) # TODO(borenet): Move this out of the try/finally. dst = api.vars.swarming_out_dir + if 'ParentRevision' in api.vars.builder_name: + dst = api.vars.swarming_out_dir.join('ParentRevision') api.build.copy_build_products(out_dir=out_dir, dst=dst) if 'SKQP' in api.vars.extra_tokens: wlist = checkout_root.join( @@ -58,6 +96,10 @@ for p in psutil.process_iter(): TEST_BUILDERS = [ 'Build-Debian9-Clang-universal-devrel-Android_SKQP', + 'Build-Debian9-Clang-x86_64-Release-NoDEPS', + 'Build-Debian9-Clang-x86_64-Release-ParentRevision', + 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', + 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', 'Build-Win-Clang-x86-Debug', ] diff --git a/infra/bots/recipes/sync_and_compile.py b/infra/bots/recipes/sync_and_compile.py deleted file mode 100644 index 128e40c773..0000000000 --- a/infra/bots/recipes/sync_and_compile.py +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 2016 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. - - -# Recipe module for Skia Swarming compile. - - -DEPS = [ - 'build', - 'checkout', - 'recipe_engine/context', - 'recipe_engine/file', - 'recipe_engine/json', - 'recipe_engine/path', - 'recipe_engine/platform', - 'recipe_engine/properties', - 'recipe_engine/python', - 'recipe_engine/step', - 'run', - 'vars', -] - - -def RunSteps(api): - api.vars.setup() - - # Check out code. - bot_update = True - checkout_root = api.checkout.default_checkout_root - checkout_chromium = False - checkout_flutter = False - flutter_android = False - parent_rev = False - - if 'NoDEPS' in api.properties['buildername']: - bot_update = False - checkout_root = api.path['start_dir'] - if 'CommandBuffer' in api.vars.builder_name: - checkout_chromium = True - if 'Flutter' in api.vars.builder_name: - checkout_root = checkout_root.join('flutter') - checkout_flutter = True - if 'Android' in api.vars.builder_name: - flutter_android = True - if 'ParentRevision' in api.vars.builder_name: - parent_rev = True - - if bot_update: - api.checkout.bot_update( - checkout_root=checkout_root, - checkout_chromium=checkout_chromium, - checkout_flutter=checkout_flutter, - flutter_android=flutter_android, - parent_rev=parent_rev) - else: - api.checkout.git(checkout_root=checkout_root) - - api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir) - - out_dir = checkout_root.join( - 'skia', 'out', api.vars.builder_name, api.vars.configuration) - if 'Flutter' in api.vars.builder_name: - out_dir = checkout_root.join('src', 'out', 'android_release') - - try: - api.build(checkout_root=checkout_root, out_dir=out_dir) - - # TODO(borenet): Move this out of the try/finally. - dst = api.vars.swarming_out_dir - if 'ParentRevision' in api.vars.builder_name: - dst = api.vars.swarming_out_dir.join('ParentRevision') - api.build.copy_build_products(out_dir=out_dir, dst=dst) - finally: - if 'Win' in api.vars.builder_cfg.get('os', ''): - api.python.inline( - name='cleanup', - program='''import psutil -for p in psutil.process_iter(): - try: - if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'): - p.kill() - except psutil._error.AccessDenied: - pass -''', - infra_step=True) - - api.run.check_failure() - - -TEST_BUILDERS = [ - 'Build-Debian9-Clang-x86_64-Release-ParentRevision', - 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', - 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', - 'Build-Win10-Clang-x86_64-Release-NoDEPS', -] - - -def GenTests(api): - for builder in TEST_BUILDERS: - test = ( - api.test(builder) + - api.properties(buildername=builder, - repository='https://skia.googlesource.com/skia.git', - revision='abc123', - path_config='kitchen', - swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists( - api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') - ) - ) - if 'Win' in builder: - test += api.platform('win', 64) - yield test diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 29719d3ab0..30d51ec604 100755 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -3046,6 +3046,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3064,6 +3076,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3075,7 +3102,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3101,9 +3128,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3115,6 +3141,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3133,6 +3171,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3144,7 +3197,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3170,9 +3223,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3184,6 +3236,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3202,6 +3266,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -3223,7 +3302,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3249,9 +3328,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3263,6 +3341,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3281,6 +3371,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/cast_toolchain", "path": "cast_toolchain", @@ -3297,7 +3402,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromecast\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromecast\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3323,9 +3428,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3337,6 +3441,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3355,6 +3471,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3366,7 +3497,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3392,9 +3523,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3406,6 +3536,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3424,6 +3566,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3435,7 +3592,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_API26\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_API26\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3461,9 +3618,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3475,6 +3631,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3493,6 +3661,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3504,7 +3687,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3530,9 +3713,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3544,6 +3726,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3562,6 +3756,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3573,7 +3782,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3599,9 +3808,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3613,6 +3821,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3631,6 +3851,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3642,7 +3877,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3668,9 +3903,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3682,6 +3916,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3700,6 +3946,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -3721,7 +3982,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3747,9 +4008,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3761,6 +4021,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3779,6 +4051,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/cast_toolchain", "path": "cast_toolchain", @@ -3795,7 +4082,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromecast\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromecast\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3821,9 +4108,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3890,7 +4176,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm-Release-Flutter_Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -3930,6 +4216,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -3948,6 +4246,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -3959,7 +4272,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -3985,9 +4298,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -3999,6 +4311,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4017,6 +4341,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4028,7 +4367,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4054,9 +4393,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4068,6 +4406,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4086,6 +4436,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4097,7 +4462,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4123,9 +4488,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4137,6 +4501,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4155,6 +4531,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4166,7 +4557,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4192,9 +4583,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4206,6 +4596,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4224,6 +4626,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4235,7 +4652,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4261,9 +4678,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4275,6 +4691,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4293,6 +4721,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4304,7 +4747,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-arm64-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4330,9 +4773,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4464,6 +4906,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4482,6 +4936,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4493,7 +4962,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x64-Debug-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4519,9 +4988,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4533,6 +5001,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4551,6 +5031,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4562,7 +5057,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x64-Release-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4588,9 +5083,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4602,6 +5096,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4620,6 +5126,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -4631,7 +5152,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4657,9 +5178,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4671,6 +5191,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4689,6 +5221,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4700,7 +5247,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4726,9 +5273,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4740,6 +5286,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4758,6 +5316,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4769,7 +5342,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Debug-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4795,9 +5368,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4809,6 +5381,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4827,6 +5411,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4838,7 +5437,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-Release-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4864,9 +5463,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4878,6 +5476,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -4896,6 +5506,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_linux", "path": "android_ndk_linux", @@ -4907,7 +5532,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-Release-Android_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-Release-Android_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -4933,9 +5558,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -4948,6 +5572,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -4968,6 +5604,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -4975,7 +5626,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86-devrel-Android_SKQP\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86-devrel-Android_SKQP\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5001,9 +5652,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5015,6 +5665,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5033,6 +5695,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5044,7 +5721,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5070,9 +5747,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5084,6 +5760,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5102,6 +5790,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5113,7 +5816,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5139,9 +5842,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5153,6 +5855,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5171,6 +5885,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5182,7 +5911,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5208,9 +5937,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5222,6 +5950,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5240,6 +5980,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5256,7 +6011,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5282,9 +6037,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5296,6 +6050,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5314,6 +6080,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5325,7 +6106,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-MSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-MSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5351,9 +6132,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5365,6 +6145,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5383,6 +6175,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5404,7 +6211,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-OpenCL\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-OpenCL\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5430,9 +6237,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5444,6 +6250,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5462,6 +6280,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5473,7 +6306,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5499,9 +6332,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5513,6 +6345,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5531,6 +6375,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5542,7 +6401,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SafeStack\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SafeStack\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5568,9 +6427,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5582,6 +6440,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5600,6 +6470,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5611,7 +6496,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Static\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Static\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5637,9 +6522,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5651,6 +6535,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5669,6 +6565,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5685,7 +6596,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SwiftShader\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SwiftShader\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5711,9 +6622,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5725,6 +6635,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5743,6 +6665,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5759,7 +6696,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SwiftShader_MSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5785,9 +6722,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5799,6 +6735,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5817,6 +6765,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5828,7 +6791,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Tidy\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Tidy\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5854,9 +6817,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5868,6 +6830,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5886,6 +6860,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5897,7 +6886,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5923,9 +6912,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -5937,6 +6925,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -5955,6 +6955,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -5966,7 +6981,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Wuffs\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -5992,9 +7007,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6006,6 +7020,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6024,6 +7050,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6035,7 +7076,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6061,9 +7102,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6075,6 +7115,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6093,6 +7145,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6104,7 +7171,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6130,9 +7197,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6144,6 +7210,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6162,6 +7240,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6173,7 +7266,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6199,9 +7292,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6213,6 +7305,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6231,6 +7335,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6242,7 +7361,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ASAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6268,9 +7387,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6341,7 +7459,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-CMake\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -6382,6 +7500,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6400,6 +7530,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6416,7 +7561,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6442,9 +7587,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6456,6 +7600,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6474,6 +7630,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6485,7 +7656,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Fast\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Fast\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6511,9 +7682,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6576,7 +7746,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-NoDEPS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -6671,7 +7841,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-ParentRevision\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -6711,6 +7881,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6729,6 +7911,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6740,7 +7937,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SKNX_NO_SIMD\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6766,9 +7963,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6780,6 +7976,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6798,6 +8006,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6809,7 +8032,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6835,9 +8058,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6849,6 +8071,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6867,6 +8101,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6878,7 +8127,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6904,9 +8153,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6918,6 +8166,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -6936,6 +8196,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -6947,7 +8222,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -6973,9 +8248,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -6987,6 +8261,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7005,6 +8291,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7016,7 +8317,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Static\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Static\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7042,9 +8343,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7056,6 +8356,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7074,6 +8386,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7090,7 +8417,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SwiftShader\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-SwiftShader\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7116,9 +8443,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7130,6 +8456,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7148,6 +8486,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7159,7 +8512,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7185,9 +8538,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7199,6 +8551,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7217,6 +8581,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7228,7 +8607,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-TSAN_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7254,9 +8633,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7268,6 +8646,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7286,6 +8676,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7297,7 +8702,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7323,9 +8728,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7337,6 +8741,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7355,6 +8771,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_linux", "path": "clang_linux", @@ -7366,7 +8797,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Wuffs\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Wuffs\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7392,9 +8823,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7407,6 +8837,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7427,6 +8869,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7434,7 +8891,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-asmjs-Debug-PathKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-asmjs-Debug-PathKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7461,9 +8918,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7476,6 +8932,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7496,6 +8964,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7503,7 +8986,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-asmjs-Release-PathKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-asmjs-Release-PathKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7530,9 +9013,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7545,6 +9027,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7565,6 +9059,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7572,7 +9081,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-CanvasKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-CanvasKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7599,9 +9108,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7614,6 +9122,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7634,6 +9154,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7641,7 +9176,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-CanvasKit_CPU\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-CanvasKit_CPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7668,9 +9203,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7683,6 +9217,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7703,6 +9249,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7710,7 +9271,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-PathKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Debug-PathKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7737,9 +9298,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7752,6 +9312,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7772,6 +9344,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7779,7 +9366,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Release-CanvasKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Release-CanvasKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7806,9 +9393,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7821,6 +9407,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7841,6 +9439,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7848,7 +9461,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7875,9 +9488,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7890,6 +9502,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "docker", "path": "cache/docker" @@ -7910,6 +9534,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -7917,7 +9556,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-EMCC-wasm-Release-PathKit\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-EMCC-wasm-Release-PathKit\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -7944,9 +9583,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -7958,6 +9596,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -7976,6 +9626,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", @@ -7987,7 +9652,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-loongson3a-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-loongson3a-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8013,9 +9678,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8027,6 +9691,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8045,6 +9721,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", @@ -8056,7 +9747,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-loongson3a-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-loongson3a-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8082,9 +9773,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8096,6 +9786,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8114,6 +9816,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", @@ -8125,7 +9842,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-mips64el-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-mips64el-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8151,9 +9868,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8165,6 +9881,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8183,6 +9911,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/mips64el_toolchain_linux", "path": "mips64el_toolchain_linux", @@ -8194,7 +9937,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-mips64el-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-mips64el-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8220,9 +9963,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8234,6 +9976,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8251,6 +10005,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8258,7 +10027,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8284,9 +10053,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8298,6 +10066,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8315,6 +10095,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8322,7 +10117,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8348,9 +10143,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8362,6 +10156,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8379,6 +10185,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8386,7 +10207,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8412,9 +10233,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8426,6 +10246,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8443,6 +10275,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8450,7 +10297,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Debug-NoGPU\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Debug-NoGPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8476,9 +10323,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8490,6 +10336,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8507,6 +10365,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8514,7 +10387,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8540,9 +10413,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8554,6 +10426,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8571,6 +10455,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8578,7 +10477,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Release-NoGPU\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-NoGPU\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8604,9 +10503,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8618,6 +10516,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8635,6 +10545,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8642,7 +10567,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8668,9 +10593,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8682,6 +10606,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8699,6 +10635,21 @@ "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -8706,7 +10657,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-GCC-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Debian9-GCC-x86_64-Release-Shared\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8732,9 +10683,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8747,6 +10697,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -8768,6 +10730,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -8779,7 +10756,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm-Debug-iOS\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm-Debug-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8804,9 +10781,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8819,6 +10795,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -8840,6 +10828,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -8851,7 +10854,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm-Release-iOS\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8876,9 +10879,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8890,6 +10892,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -8908,6 +10922,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_darwin", "path": "android_ndk_darwin", @@ -8919,7 +10948,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Debug-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -8944,9 +10973,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -8959,6 +10987,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -8980,6 +11020,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -8991,7 +11046,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9016,9 +11071,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9031,6 +11085,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9052,6 +11118,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9063,7 +11144,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9088,9 +11169,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9103,6 +11183,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9124,6 +11216,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9135,7 +11242,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9160,9 +11267,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9175,6 +11281,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9196,6 +11314,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9207,7 +11340,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9232,9 +11365,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9247,6 +11379,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9268,6 +11412,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9279,7 +11438,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x64-Release-iOS\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x64-Release-iOS\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9304,9 +11463,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9319,6 +11477,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9340,6 +11510,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9351,7 +11536,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9376,9 +11561,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9391,6 +11575,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9412,6 +11608,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9423,7 +11634,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9448,9 +11659,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9463,6 +11673,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9484,6 +11706,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9495,7 +11732,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN_Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN_Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9520,9 +11757,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9593,7 +11829,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -9633,6 +11869,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9654,6 +11902,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9665,7 +11928,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9690,9 +11953,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9705,6 +11967,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9726,6 +12000,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9742,7 +12031,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-MoltenVK_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-MoltenVK_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9767,9 +12056,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9782,6 +12070,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9803,6 +12103,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9814,7 +12129,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-OpenCL\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-OpenCL\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9839,9 +12154,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9854,6 +12168,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9875,6 +12201,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9886,7 +12227,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9911,9 +12252,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -9926,6 +12266,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -9947,6 +12299,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -9958,7 +12325,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-ASAN_Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-ASAN_Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -9983,9 +12350,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10056,7 +12422,7 @@ "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}", "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", - "sync_and_compile", + "compile", "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], @@ -10096,6 +12462,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -10117,6 +12495,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -10128,7 +12521,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10153,9 +12546,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10168,6 +12560,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -10189,6 +12593,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -10205,7 +12624,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10230,9 +12649,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10245,6 +12663,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -10266,6 +12696,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -10277,7 +12722,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10302,9 +12747,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10317,6 +12761,18 @@ "name": "vpython", "path": "cache/vpython" }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" + }, { "name": "xcode", "path": "cache/Xcode.app" @@ -10338,6 +12794,21 @@ "path": "cipd_bin_packages", "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "infra/tools/mac_toolchain/${platform}", "path": "mac_toolchain", @@ -10349,7 +12820,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN_Metal\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN_Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10374,9 +12845,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10388,6 +12858,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10411,6 +12893,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10422,7 +12919,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10450,9 +12947,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10464,6 +12960,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10487,6 +12995,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10498,7 +13021,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Debug-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10526,9 +13049,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10540,6 +13062,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10563,6 +13097,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10574,7 +13123,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10602,9 +13151,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10616,6 +13164,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10639,6 +13199,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10650,7 +13225,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10678,9 +13253,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10692,6 +13266,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10715,6 +13301,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/android_ndk_windows", "path": "n", @@ -10726,7 +13327,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-Android\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-arm64-Release-Android\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10753,9 +13354,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10767,6 +13367,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10790,6 +13402,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10801,7 +13428,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10829,9 +13456,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10843,6 +13469,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10866,6 +13504,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10877,7 +13530,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug-Exceptions\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Debug-Exceptions\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10905,9 +13558,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10919,6 +13571,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -10942,6 +13606,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -10953,7 +13632,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -10981,9 +13660,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -10995,6 +13673,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11018,6 +13708,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11029,7 +13734,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11057,9 +13762,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11071,6 +13775,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11094,6 +13810,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11105,7 +13836,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11133,9 +13864,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11147,6 +13877,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11170,6 +13912,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11186,7 +13943,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-OpenCL\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-OpenCL\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11214,9 +13971,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11228,6 +13984,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11251,6 +14019,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11262,7 +14045,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-UBSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11290,9 +14073,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11304,6 +14086,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11327,6 +14121,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11338,7 +14147,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11366,9 +14175,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11380,6 +14188,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11403,6 +14223,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11414,7 +14249,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Debug-Wuffs\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11442,9 +14277,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11456,6 +14290,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11479,6 +14325,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11490,7 +14351,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11518,9 +14379,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11532,6 +14392,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11555,6 +14427,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11566,7 +14453,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11594,9 +14481,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11608,6 +14494,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11631,6 +14529,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11642,7 +14555,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-Shared\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11670,9 +14583,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11684,6 +14596,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11707,6 +14631,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11718,7 +14657,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-UBSAN\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-UBSAN\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11746,9 +14685,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11760,6 +14698,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11783,6 +14733,21 @@ "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" + }, { "name": "skia/bots/clang_win", "path": "clang_win", @@ -11794,7 +14759,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11822,9 +14787,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11836,6 +14800,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11858,6 +14834,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -11865,7 +14856,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-arm64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11893,9 +14884,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11907,6 +14897,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -11929,6 +14931,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -11936,7 +14953,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-arm64-Debug-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -11964,9 +14981,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -11978,6 +14994,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12000,6 +15028,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12007,7 +15050,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-arm64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12035,9 +15078,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12049,6 +15091,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12071,6 +15125,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12078,7 +15147,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-arm64-Release-ANGLE\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12106,9 +15175,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12120,6 +15188,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12142,6 +15222,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12149,7 +15244,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12177,9 +15272,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12191,6 +15285,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12213,6 +15319,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12220,7 +15341,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12248,9 +15369,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12262,6 +15382,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12284,6 +15416,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12291,7 +15438,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12319,9 +15466,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12333,6 +15479,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12355,6 +15513,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12362,7 +15535,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12390,9 +15563,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12404,6 +15576,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12426,6 +15610,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12433,7 +15632,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug-MSRTC_Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12461,9 +15660,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12475,6 +15673,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12497,6 +15707,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12504,7 +15729,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12532,9 +15757,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12546,6 +15770,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12568,6 +15804,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12575,7 +15826,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Wuffs\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12603,9 +15854,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12617,6 +15867,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12639,6 +15901,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12646,7 +15923,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Release\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12674,9 +15951,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12688,6 +15964,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12710,6 +15998,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12717,7 +16020,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Release-Shared\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12745,9 +16048,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build" @@ -12759,6 +16061,18 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "git", + "path": "cache/git" + }, + { + "name": "git_cache", + "path": "cache/git_cache" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ @@ -12781,6 +16095,21 @@ "name": "infra/python/cpython/${platform}", "path": "cipd_bin_packages", "version": "version:2.7.15.chromium14" + }, + { + "name": "infra/git/${platform}", + "path": "cipd_bin_packages", + "version": "version:2.17.1.chromium15" + }, + { + "name": "infra/tools/git/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:c9c8a52bfeaf8bc00ece22fdfd447822c8fcad77" + }, + { + "name": "infra/tools/luci/git-credential-luci/${platform}", + "path": "cipd_bin_packages", + "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e" } ], "command": [ @@ -12788,7 +16117,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Win-MSVC-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [ @@ -12816,9 +16145,8 @@ "extra_tags": { "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" }, - "idempotent": true, "io_timeout_ns": 3600000000000, - "isolate": "compile.isolate", + "isolate": "swarm_recipe.isolate", "max_attempts": 2, "outputs": [ "build"