diff options
| author |  Eric Boren <borenet@google.com> | 2017-04-18 15:49:27 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-19 11:24:24 +0000 |
| commit | e16fb7584a15802949d1eb8b4ad60952619da7d4 (patch) | |
| tree | 948e2e2d4c9caf2a2994249559f9ba1680d48a97 | |
| parent | c1e9617e82a2d573c890ee17e69a3d4699800f05 (diff) | |
Recipes: Use strict coverage, part 1
Shouldn't change any behavior.
Bug: skia:
Change-Id: I953e0da886a6d61096eba7915101f245a6cec741
Reviewed-on: https://skia-review.googlesource.com/13765
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
106 files changed, 5705 insertions, 201 deletions
diff --git a/infra/bots/recipe_modules/builder_name_schema/__init__.py b/infra/bots/recipe_modules/builder_name_schema/__init__.py index 0b1d7673b9..a3c9297009 100644 --- a/infra/bots/recipe_modules/builder_name_schema/__init__.py +++ b/infra/bots/recipe_modules/builder_name_schema/__init__.py @@ -4,7 +4,3 @@ DEPS = [ ] - - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/builder_name_schema/api.py b/infra/bots/recipe_modules/builder_name_schema/api.py index edfd683140..5ce05842c3 100644 --- a/infra/bots/recipe_modules/builder_name_schema/api.py +++ b/infra/bots/recipe_modules/builder_name_schema/api.py @@ -27,13 +27,8 @@ class BuilderNameSchemaApi(recipe_api.RecipeApi): self.BUILDER_ROLE_TEST = builder_name_schema.BUILDER_ROLE_TEST self.BUILDER_ROLES = builder_name_schema.BUILDER_ROLES - self.TRYBOT_NAME_SUFFIX = builder_name_schema.TRYBOT_NAME_SUFFIX - - def MakeBuilderName(self, *args, **kwargs): # pragma: no cover + def MakeBuilderName(self, *args, **kwargs): return builder_name_schema.MakeBuilderName(*args, **kwargs) - def IsTrybot(self, *args, **kwargs): # pragma: no cover - return builder_name_schema.IsTrybot(*args, **kwargs) - def DictForBuilderName(self, *args, **kwargs): return builder_name_schema.DictForBuilderName(*args, **kwargs) diff --git a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json index 6a8c92175b..62971ee975 100644 --- a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json +++ b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json @@ -38,6 +38,5 @@ "configuration" ] }, - "builder_name_sep": "-", - "trybot_name_suffix": "Trybot" + "builder_name_sep": "-" } diff --git a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py index 8319789154..b004ead532 100644 --- a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py +++ b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py @@ -33,9 +33,6 @@ BUILDER_ROLES = (BUILDER_ROLE_CANARY, BUILDER_ROLE_PERF, BUILDER_ROLE_TEST) -# Suffix which distinguishes trybots from normal bots. -TRYBOT_NAME_SUFFIX = None - def _LoadSchema(): """ Load the builder naming schema from the JSON file. """ @@ -65,10 +62,6 @@ def _LoadSchema(): BUILDER_NAME_SEP = _UnicodeToStr( builder_name_schema_json['builder_name_sep']) - global TRYBOT_NAME_SUFFIX - TRYBOT_NAME_SUFFIX = _UnicodeToStr( - builder_name_schema_json['trybot_name_suffix']) - # Since the builder roles are dictionary keys, just assert that the global # variables above account for all of them. assert len(BUILDER_ROLES) == len(BUILDER_NAME_SCHEMA) @@ -79,8 +72,7 @@ def _LoadSchema(): _LoadSchema() -def MakeBuilderName(role, extra_config=None, is_trybot=False, - **kwargs): # pragma: no cover +def MakeBuilderName(role, extra_config=None, **kwargs): # pragma: no cover schema = BUILDER_NAME_SCHEMA.get(role) if not schema: # pragma: no cover raise ValueError('%s is not a recognized role.' % role) @@ -96,46 +88,9 @@ def MakeBuilderName(role, extra_config=None, is_trybot=False, name_parts.extend([kwargs[attribute] for attribute in schema]) if extra_config: name_parts.append(extra_config) - if is_trybot: - name_parts.append(TRYBOT_NAME_SUFFIX) return BUILDER_NAME_SEP.join(name_parts) -def IsTrybot(builder_name): # pragma: no cover - """ Returns true if builder_name refers to a trybot (as opposed to a - waterfall bot). """ - return builder_name.endswith(TRYBOT_NAME_SUFFIX) - - -def GetWaterfallBot(builder_name): # pragma: no cover - """Returns the name of the waterfall bot for this builder. If it is not a - trybot, builder_name is returned unchanged. If it is a trybot the name is - returned without the trybot suffix.""" - if not IsTrybot(builder_name): - return builder_name - return _WithoutSuffix(builder_name, BUILDER_NAME_SEP + TRYBOT_NAME_SUFFIX) - - -def TrybotName(builder_name): # pragma: no cover - """Returns the name of the trybot clone of this builder. - - If the given builder is a trybot, the name is returned unchanged. If not, the - TRYBOT_NAME_SUFFIX is appended. - """ - if builder_name.endswith(TRYBOT_NAME_SUFFIX): - return builder_name - return builder_name + BUILDER_NAME_SEP + TRYBOT_NAME_SUFFIX - - -def _WithoutSuffix(string, suffix): # pragma: no cover - """ Returns a copy of string 'string', but with suffix 'suffix' removed. - Raises ValueError if string does not end with suffix. """ - if not string.endswith(suffix): - raise ValueError('_WithoutSuffix: string %s does not end with suffix %s' % ( - string, suffix)) - return string[:-len(suffix)] - - def DictForBuilderName(builder_name): """Makes a dictionary containing details about the builder from its name.""" split_name = builder_name.split(BUILDER_NAME_SEP) @@ -146,12 +101,7 @@ def DictForBuilderName(builder_name): except: # pragma: no cover raise ValueError('Invalid builder name: %s' % builder_name) - result = {'is_trybot': False} - - if split_name[-1] == TRYBOT_NAME_SUFFIX: - result['is_trybot'] = True - split_name.pop() - + result = {} if split_name[0] in BUILDER_NAME_SCHEMA.keys(): key_list = BUILDER_NAME_SCHEMA[split_name[0]] result['role'] = pop_front() diff --git a/infra/bots/recipe_modules/builder_name_schema/example.expected/test.json b/infra/bots/recipe_modules/builder_name_schema/example.expected/test.json new file mode 100644 index 0000000000..7726ecb249 --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/example.expected/test.json @@ -0,0 +1,7 @@ +[ + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/builder_name_schema/example.py b/infra/bots/recipe_modules/builder_name_schema/example.py new file mode 100644 index 0000000000..451019fa46 --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/example.py @@ -0,0 +1,19 @@ +# Copyright 2017 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. + + +DEPS = [ + 'builder_name_schema', +] + + +def RunSteps(api): + name = 'Build-Ubuntu-Clang-x64-Release-Android' + d = api.builder_name_schema.DictForBuilderName(name) + got = api.builder_name_schema.MakeBuilderName(**d) + assert got == name + + +def GenTests(api): + yield api.test('test') diff --git a/infra/bots/recipe_modules/core/__init__.py b/infra/bots/recipe_modules/core/__init__.py index 2c66e77b82..9112c1c4f8 100644 --- a/infra/bots/recipe_modules/core/__init__.py +++ b/infra/bots/recipe_modules/core/__init__.py @@ -9,13 +9,9 @@ DEPS = [ 'depot_tools/tryserver', 'flavor', 'recipe_engine/path', - 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/step', 'run', 'vars', ] - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index 005ee27733..28a5d1fa10 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -36,8 +36,8 @@ class SkiaApi(recipe_api.RecipeApi): def update_repo(self, parent_dir, repo): """Update an existing repo. This is safe to call without gen_steps.""" repo_path = parent_dir.join(repo.name) - if self.m.path.exists(repo_path): # pragma: nocover - if self.m.platform.is_win: + if self.m.path.exists(repo_path) or self._test_data.enabled: + if 'Win' in self.m.properties.get('buildername', ''): git = 'git.bat' else: git = 'git' diff --git a/infra/bots/recipe_modules/core/example.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/example.expected/Housekeeper-Weekly-RecreateSKPs.json new file mode 100644 index 0000000000..64b600d718 --- /dev/null +++ b/infra/bots/recipe_modules/core/example.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -0,0 +1,210 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_/_B_WORK]", + "511" + ], + "infra_step": true, + "name": "makedirs checkout_path", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://chromium.googlesource.com/chromium/src.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git remote set-url (2)" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git fetch (2)" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/lkgr" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git reset (2)" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git clean (2)" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", + "--revision", + "skia@abc123", + "--revision", + "src@origin/lkgr", + "--output_manifest" + ], + "cwd": "[CUSTOM_/_B_WORK]", + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_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@ \"src\": \"origin/lkgr\"@@@", + "@@@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@ \"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_PACKAGE_REPO[depot_tools]/gclient.py", + "runhooks" + ], + "cwd": "[CUSTOM_/_B_WORK]", + "env": { + "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gclient runhooks" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/tmp", + "511" + ], + "infra_step": true, + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/core/example.expected/flutter_trybot.json b/infra/bots/recipe_modules/core/example.expected/flutter_trybot.json new file mode 100644 index 0000000000..d22609abb3 --- /dev/null +++ b/infra/bots/recipe_modules/core/example.expected/flutter_trybot.json @@ -0,0 +1,142 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_/_B_WORK]/flutter", + "511" + ], + "infra_step": true, + "name": "makedirs checkout_path", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://github.com/flutter/engine.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']", + "--patch_root", + "src/third_party/skia", + "--revision_mapping_file", + "{\"src/flutter\": \"got_flutter_revision\", \"src/third_party/skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_/_B_CACHE]", + "--gerrit_repo", + "https://skia.googlesource.com/skia.git", + "--gerrit_ref", + "refs/changes/89/456789/12", + "--output_json", + "/path/to/tmp/json", + "--revision", + "src/flutter@origin/master", + "--revision", + "src/third_party/skia@abc123", + "--output_manifest" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter", + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_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@ \"src/flutter\": \"origin/master\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": \"abc123\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"src/third_party/skia\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/skia.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d9c4a4d173a97ef2832b65636b4200bb93ea8ee1\"@@@", + "@@@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\": \"src/third_party/skia\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"got_flutter_revision\": \"9221bca00ddbd888260084def81f09543281b952\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_flutter_revision_cp\": \"refs/heads/master@{#84512}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"d9c4a4d173a97ef2832b65636b4200bb93ea8ee1\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#143121}\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\", @@@", + "@@@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@\"d9c4a4d173a97ef2832b65636b4200bb93ea8ee1\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#143121}\"@@@", + "@@@SET_BUILD_PROPERTY@got_flutter_revision_cp@\"refs/heads/master@{#84512}\"@@@", + "@@@SET_BUILD_PROPERTY@got_flutter_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/core/example.expected/no_persistent_checkout.json b/infra/bots/recipe_modules/core/example.expected/no_persistent_checkout.json new file mode 100644 index 0000000000..2b14fe5d9f --- /dev/null +++ b/infra/bots/recipe_modules/core/example.expected/no_persistent_checkout.json @@ -0,0 +1,30 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/tmp", + "511" + ], + "infra_step": true, + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/core/example.expected/pdfium_trybot.json b/infra/bots/recipe_modules/core/example.expected/pdfium_trybot.json new file mode 100644 index 0000000000..df49c7e4b5 --- /dev/null +++ b/infra/bots/recipe_modules/core/example.expected/pdfium_trybot.json @@ -0,0 +1,142 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_/_B_WORK]", + "511" + ], + "infra_step": true, + "name": "makedirs checkout_path", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://pdfium.googlesource.com/pdfium.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "--patch_root", + "pdfium/third_party/skia", + "--revision_mapping_file", + "{\"pdfium\": \"got_pdfium_revision\", \"pdfium/third_party/skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_/_B_CACHE]", + "--gerrit_repo", + "https://skia.googlesource.com/skia.git", + "--gerrit_ref", + "refs/changes/89/456789/12", + "--output_json", + "/path/to/tmp/json", + "--revision", + "pdfium@origin/master", + "--revision", + "pdfium/third_party/skia@abc123", + "--output_manifest" + ], + "cwd": "[CUSTOM_/_B_WORK]", + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_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@ \"pdfium\": \"origin/master\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"pdfium/third_party/skia\": \"abc123\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"pdfium\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/pdfium.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d69d97171c17fdb12a52f78847e2ee2f0594eff1\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"pdfium/third_party/skia\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/pdfium/third_party/skia.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"85501db4bcbeb8f295309fdcda1a743388f0f104\"@@@", + "@@@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\": \"pdfium/third_party/skia\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"got_pdfium_revision\": \"d69d97171c17fdb12a52f78847e2ee2f0594eff1\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_pdfium_revision_cp\": \"refs/heads/master@{#52055}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"85501db4bcbeb8f295309fdcda1a743388f0f104\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#120212}\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"root\": \"pdfium\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@SET_BUILD_PROPERTY@got_pdfium_revision_cp@\"refs/heads/master@{#52055}\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision@\"85501db4bcbeb8f295309fdcda1a743388f0f104\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#120212}\"@@@", + "@@@SET_BUILD_PROPERTY@got_pdfium_revision@\"d69d97171c17fdb12a52f78847e2ee2f0594eff1\"@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/core/example.expected/test.json b/infra/bots/recipe_modules/core/example.expected/test.json new file mode 100644 index 0000000000..c831dab096 --- /dev/null +++ b/infra/bots/recipe_modules/core/example.expected/test.json @@ -0,0 +1,154 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[CUSTOM_C:\\_B_WORK]", + "511" + ], + "infra_step": true, + "name": "makedirs checkout_path", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_C:\\_B_CACHE]", + "--gerrit_repo", + "https://skia.googlesource.com/skia.git", + "--gerrit_ref", + "refs/changes/89/456789/12", + "--output_json", + "/path/to/tmp/json", + "--revision", + "skia@abc123", + "--output_manifest" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]", + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_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@ \"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", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/tmp", + "511" + ], + "infra_step": true, + "name": "makedirs tmp_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/core/example.py b/infra/bots/recipe_modules/core/example.py new file mode 100644 index 0000000000..9cd7b47890 --- /dev/null +++ b/infra/bots/recipe_modules/core/example.py @@ -0,0 +1,103 @@ +# Copyright 2017 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. + + +DEPS = [ + 'core', + 'recipe_engine/path', + 'recipe_engine/properties', +] + + +def RunSteps(api): + api.core.setup() + + +def GenTests(api): + buildername = 'Build-Win-MSVC-x86_64-Release-Vulkan' + yield ( + api.test('test') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.properties(patch_storage='gerrit') + + api.properties.tryserver( + buildername=buildername, + gerrit_project='skia', + gerrit_url='https://skia-review.googlesource.com/', + ) + ) + + buildername = 'Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE' + yield ( + api.test('no_persistent_checkout') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.properties(patch_storage='gerrit') + + api.properties.tryserver( + buildername=buildername, + gerrit_project='skia', + gerrit_url='https://skia-review.googlesource.com/', + ) + ) + + buildername = 'Build-Ubuntu-GCC-x86_64-Release-PDFium' + yield ( + api.test('pdfium_trybot') + + api.properties( + repository='https://skia.googlesource.com/skia.git', + buildername=buildername, + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]', + revision='abc123', + patch_issue=500, + patch_set=1, + patch_storage='gerrit') + + api.properties.tryserver( + buildername=buildername, + gerrit_project='skia', + gerrit_url='https://skia-review.googlesource.com/', + ) + + api.path.exists( + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') + ) + ) + + buildername = 'Build-Ubuntu-GCC-x86_64-Release-Flutter_Android' + yield ( + api.test('flutter_trybot') + + api.properties( + repository='https://skia.googlesource.com/skia.git', + buildername=buildername, + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]', + revision='abc123', + patch_issue=500, + patch_set=1, + patch_storage='gerrit') + + api.properties.tryserver( + buildername=buildername, + gerrit_project='skia', + gerrit_url='https://skia-review.googlesource.com/', + ) + + api.path.exists( + api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') + ) + ) + + builder = 'Housekeeper-Weekly-RecreateSKPs' + yield ( + 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('skp_output')) + ) diff --git a/infra/bots/recipe_modules/ct/__init__.py b/infra/bots/recipe_modules/ct/__init__.py index f9d542c303..3756b3cbb7 100644 --- a/infra/bots/recipe_modules/ct/__init__.py +++ b/infra/bots/recipe_modules/ct/__init__.py @@ -9,7 +9,3 @@ DEPS = [ 'recipe_engine/step', 'run', ] - - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/ct/api.py b/infra/bots/recipe_modules/ct/api.py index 91478fb50e..314903fe51 100644 --- a/infra/bots/recipe_modules/ct/api.py +++ b/infra/bots/recipe_modules/ct/api.py @@ -46,6 +46,6 @@ class CTApi(recipe_api.RecipeApi): gsutil_args.append(str(slave_dest_dir)) try: self.m.gsutil(gsutil_args, use_retry_wrapper=False) - except self.m.step.StepFailure: # pragma: nocover + except self.m.step.StepFailure: # Some subdirectories might have no SKPs in them. pass diff --git a/infra/bots/recipe_modules/ct/example.expected/failed_gsutil.json b/infra/bots/recipe_modules/ct/example.expected/failed_gsutil.json new file mode 100644 index 0000000000..e51ee004c7 --- /dev/null +++ b/infra/bots/recipe_modules/ct/example.expected/failed_gsutil.json @@ -0,0 +1,160 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::file]/resources/fileutil.py", + "rmtree", + "[START_DIR]/skps/slave0" + ], + "env": { + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "infra_step": true, + "name": "rmtree slave0" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/skps/slave0", + "511" + ], + "name": "makedirs slave0", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", + "--", + "-m", + "cp", + "gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/101/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/102/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/103/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/104/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/105/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/106/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/107/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/108/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/109/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/110/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/111/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/112/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/113/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/114/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/115/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/116/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/117/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/118/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/119/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/120/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/121/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/122/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/123/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/124/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/125/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/126/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/127/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/128/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/129/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/130/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/131/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/132/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/133/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/134/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/135/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/136/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/137/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/138/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/139/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/140/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/141/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/142/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/143/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/144/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/145/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/146/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/147/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/148/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/149/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/150/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/151/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/152/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/153/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/154/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/155/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/156/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/157/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/158/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/159/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/160/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/161/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/162/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/163/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/164/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/165/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/166/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/167/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/168/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/169/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/170/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/171/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/172/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/173/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/174/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/175/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/176/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/177/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/178/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/179/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/180/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/181/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/182/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/183/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/184/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/185/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/186/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/187/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/188/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/189/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/190/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/191/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/192/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/193/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/194/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/195/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/196/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/197/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/198/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp", + "[START_DIR]/skps/slave0" + ], + "infra_step": true, + "name": "gsutil cp", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_EXCEPTION@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/ct/example.expected/test.json b/infra/bots/recipe_modules/ct/example.expected/test.json new file mode 100644 index 0000000000..dc49be70f0 --- /dev/null +++ b/infra/bots/recipe_modules/ct/example.expected/test.json @@ -0,0 +1,156 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::file]/resources/fileutil.py", + "rmtree", + "[START_DIR]/skps/slave0" + ], + "env": { + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "infra_step": true, + "name": "rmtree slave0" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/skps/slave0", + "511" + ], + "name": "makedirs slave0", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", + "--", + "-m", + "cp", + "gs://cluster-telemetry/swarming/skps/All/abc123/100/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/101/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/102/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/103/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/104/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/105/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/106/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/107/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/108/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/109/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/110/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/111/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/112/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/113/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/114/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/115/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/116/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/117/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/118/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/119/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/120/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/121/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/122/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/123/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/124/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/125/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/126/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/127/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/128/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/129/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/130/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/131/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/132/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/133/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/134/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/135/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/136/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/137/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/138/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/139/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/140/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/141/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/142/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/143/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/144/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/145/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/146/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/147/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/148/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/149/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/150/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/151/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/152/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/153/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/154/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/155/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/156/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/157/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/158/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/159/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/160/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/161/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/162/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/163/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/164/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/165/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/166/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/167/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/168/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/169/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/170/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/171/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/172/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/173/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/174/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/175/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/176/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/177/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/178/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/179/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/180/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/181/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/182/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/183/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/184/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/185/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/186/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/187/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/188/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/189/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/190/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/191/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/192/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/193/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/194/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/195/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/196/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/197/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/198/*.skp", + "gs://cluster-telemetry/swarming/skps/All/abc123/199/*.skp", + "[START_DIR]/skps/slave0" + ], + "infra_step": true, + "name": "gsutil cp" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/ct/example.py b/infra/bots/recipe_modules/ct/example.py new file mode 100644 index 0000000000..3b3c3f22e3 --- /dev/null +++ b/infra/bots/recipe_modules/ct/example.py @@ -0,0 +1,25 @@ +# Copyright 2017 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. + + +DEPS = [ + 'ct', + 'recipe_engine/path', +] + + +def RunSteps(api): + api.ct.download_swarming_skps( + 'All', '0', 'abc123', + api.path['start_dir'].join('skps'), + start_range=100, + num_skps=100) + + +def GenTests(api): + yield api.test('test') + yield ( + api.test('failed_gsutil') + + api.step_data('gsutil cp', retcode=1) + ) diff --git a/infra/bots/recipe_modules/run/__init__.py b/infra/bots/recipe_modules/run/__init__.py index e9a6f1c497..cb4c1ae0ee 100644 --- a/infra/bots/recipe_modules/run/__init__.py +++ b/infra/bots/recipe_modules/run/__init__.py @@ -11,7 +11,3 @@ DEPS = [ 'recipe_engine/step', 'vars', ] - - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 475bd56d28..ecec9f9db9 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -60,7 +60,7 @@ class SkiaStepApi(recipe_api.RecipeApi): def readfile(self, filename, *args, **kwargs): """Convenience function for reading files.""" - name = kwargs.pop('name') or 'read %s' % self.m.path.basename(filename) + name = kwargs.pop('name', 'read %s' % self.m.path.basename(filename)) return self.m.file.read(name, filename, infra_step=True, *args, **kwargs) def writefile(self, filename, contents): diff --git a/infra/bots/recipe_modules/run/example.expected/test.json b/infra/bots/recipe_modules/run/example.expected/test.json new file mode 100644 index 0000000000..250ca9cf17 --- /dev/null +++ b/infra/bots/recipe_modules/run/example.expected/test.json @@ -0,0 +1,260 @@ +[ + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "fail", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "echo", + "do the thing" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "do a thing" + }, + { + "cmd": [ + "echo", + "0" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "run 0" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "myfile.txt", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "read myfile.txt" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "contents", + "myfile.txt" + ], + "infra_step": true, + "name": "write myfile.txt" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::file]/resources/fileutil.py", + "rmtree", + "mydir" + ], + "env": { + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "infra_step": true, + "name": "rmtree mydir" + }, + { + "cmd": [ + "env" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "mydir:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "env" + }, + { + "cmd": [ + "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', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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", + "src", + "dst" + ], + "infra_step": true, + "name": "copy build products", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import errno@@@", + "@@@STEP_LOG_LINE@python.inline@import glob@@@", + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@import shutil@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", + "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", + "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", + "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", + "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", + "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry fail", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry fail (attempt 2)", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry fail (attempt 3)", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry fail (attempt 4)", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry fail (attempt 5)", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry success", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry success (attempt 2)", + "~followup_annotations": [ + "step returned non-zero exit code: 1", + "@@@STEP_FAILURE@@@" + ] + }, + { + "cmd": [ + "false" + ], + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" + }, + "name": "retry success (attempt 3)" + }, + { + "name": "$result", + "reason": "Failed build steps: fail, retry fail, retry fail (attempt 2), retry fail (attempt 3), retry fail (attempt 4), retry fail (attempt 5), retry success, retry success (attempt 2)", + "recipe_result": null, + "status_code": 1 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/run/example.py b/infra/bots/recipe_modules/run/example.py new file mode 100644 index 0000000000..fb61b48846 --- /dev/null +++ b/infra/bots/recipe_modules/run/example.py @@ -0,0 +1,69 @@ +# Copyright 2017 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. + + +DEPS = [ + 'recipe_engine/path', + 'recipe_engine/properties', + 'recipe_engine/step', + 'run', + 'vars', +] + + +def myfunc(api, i): + api.run(api.step, 'run %d' % i, cmd=['echo', str(i)]) + + +def RunSteps(api): + api.vars.setup() + api.run(api.step, 'fail', cmd=['false'], abort_on_failure=False) + api.run(api.step, 'do a thing', cmd=['echo', 'do the thing']) + assert len(api.run.failed_steps) == 1 + + # Run once. + for i in range(10): + api.run.run_once(myfunc, api, i) + + # Read and write files. + api.run.readfile('myfile.txt') + api.run.writefile('myfile.txt', 'contents') + api.run.rmtree('mydir') + + # Merge PATHs. + with api.step.context({'env': {'PATH': 'mydir:%(PATH)s'}}): + api.run(api.step, 'env', cmd=['env']) + + # Copy build products. + api.run.copy_build_products('src', 'dst') + + # Retries. + try: + api.run.with_retry(api.step, 'retry fail', 5, cmd=['false']) + except api.step.StepFailure: + pass + api.run.with_retry(api.step, 'retry success', 3, cmd=['false']) + + # Check failure. + api.run.check_failure() + + +def GenTests(api): + buildername = 'Build-Win-MSVC-x86_64-Release-Vulkan' + yield ( + api.test('test') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + + api.step_data('fail', retcode=1) + + api.step_data('retry fail', retcode=1) + + api.step_data('retry fail (attempt 2)', retcode=1) + + api.step_data('retry fail (attempt 3)', retcode=1) + + api.step_data('retry fail (attempt 4)', retcode=1) + + api.step_data('retry fail (attempt 5)', retcode=1) + + api.step_data('retry success', retcode=1) + + api.step_data('retry success (attempt 2)', retcode=1) + ) diff --git a/infra/bots/recipe_modules/swarming/__init__.py b/infra/bots/recipe_modules/swarming/__init__.py index cc099f61c0..3e05b02b1f 100644 --- a/infra/bots/recipe_modules/swarming/__init__.py +++ b/infra/bots/recipe_modules/swarming/__init__.py @@ -16,7 +16,3 @@ DEPS = [ 'recipe_engine/step', 'run', ] - - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/swarming/example.expected/test.json b/infra/bots/recipe_modules/swarming/example.expected/test.json new file mode 100644 index 0000000000..310d828435 --- /dev/null +++ b/infra/bots/recipe_modules/swarming/example.expected/test.json @@ -0,0 +1,863 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", + "--path", + "[START_DIR]/swarming.client", + "--url", + "https://chromium.googlesource.com/external/swarming.client.git" + ], + "name": "git setup (swarming_client)" + }, + { + "cmd": [ + "git", + "retry", + "fetch", + "origin", + "abc123" + ], + "cwd": "[START_DIR]/swarming.client", + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "infra_step": true, + "name": "git fetch (swarming_client)" + }, + { + "cmd": [ + "git", + "checkout", + "-f", + "FETCH_HEAD" + ], + "cwd": "[START_DIR]/swarming.client", + "infra_step": true, + "name": "git checkout (swarming_client)" + }, + { + "cmd": [ + "git", + "rev-parse", + "HEAD" + ], + "cwd": "[START_DIR]/swarming.client", + "infra_step": true, + "name": "read revision", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" + ] + }, + { + "cmd": [ + "git", + "clean", + "-f", + "-d", + "-x" + ], + "cwd": "[START_DIR]/swarming.client", + "infra_step": true, + "name": "git clean (swarming_client)" + }, + { + "cmd": [ + "git", + "submodule", + "sync" + ], + "cwd": "[START_DIR]/swarming.client", + "infra_step": true, + "name": "submodule sync (swarming_client)" + }, + { + "cmd": [ + "git", + "submodule", + "update", + "--init", + "--recursive" + ], + "cwd": "[START_DIR]/swarming.client", + "infra_step": true, + "name": "submodule update (swarming_client)" + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "--version" + ], + "name": "swarming.py --version", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_TEXT@0.8.6@@@" + ] + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=linux*", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "lmydirimydirnmydirumydirxmydir6mydir4" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go linux" + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=darwin", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "mmydiramydircmydir6mydir4" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go mac" + }, + { + "cmd": [ + "download_from_google_storage", + "--no_resume", + "--platform=win32", + "--no_auth", + "--bucket", + "chromium-luci", + "-d", + "wmydirimydirnmydir6mydir4" + ], + "env": { + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s" + }, + "name": "download luci-go win" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::file]/resources/fileutil.py", + "rmtree", + "[START_DIR]/luci-go" + ], + "env": { + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "infra_step": true, + "name": "rmtree luci-go" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "mydir", + "[START_DIR]/luci-go", + "0" + ], + "name": "Copy Go binary" + }, + { + "cmd": [ + "python", + "-u", + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", + "[START_DIR]/swarming_temp_dir", + "511" + ], + "name": "makedirs swarming tmp dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "{\n \"args\": [\n \"--isolate\", \n \"isolate_path\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-task.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"myvar\", \n \"myval\"\n ], \n \"dir\": \"isolate_dir\", \n \"version\": 1\n}", + "[START_DIR]/swarming_temp_dir/task.isolated.gen.json" + ], + "name": "Write task.isolated.gen.json" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[build::isolate]/resources/isolate.py", + "[START_DIR]/swarming.client", + "batcharchive", + "--dump-json", + "/path/to/tmp/json", + "--isolate-server", + "https://isolateserver.appspot.com", + "--verbose", + "[START_DIR]/swarming_temp_dir/task-0.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/task-1.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/task-2.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/task-3.isolated.gen.json", + "[START_DIR]/swarming_temp_dir/task-4.isolated.gen.json" + ], + "name": "isolate tests", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-0\": \"[dummy hash for task-0]\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"task-1\": \"[dummy hash for task-1]\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"task-2\": \"[dummy hash for task-2]\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"task-3\": \"[dummy hash for task-3]\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"task-4\": \"[dummy hash for task-4]\"@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"task-0\": \"[dummy hash for task-0]\", \"task-1\": \"[dummy hash for task-1]\", \"task-2\": \"[dummy hash for task-2]\", \"task-3\": \"[dummy hash for task-3]\", \"task-4\": \"[dummy hash for task-4]\"}@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "task-4/Linux/[dummy has", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "os", + "Linux", + "--tag", + "allow_milo:1", + "--tag", + "data:[dummy hash for task-4]", + "--tag", + "name:task-4", + "--tag", + "os:Linux", + "--tag", + "revision:abc123", + "--tag", + "stepname:task-4", + "[dummy hash for task-4]" + ], + "infra_step": true, + "name": "[trigger] task-4", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"task-4/Linux/[dummy has\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-4/Linux/[dummy has\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "task-2/Linux/[dummy has", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "os", + "Linux", + "--tag", + "allow_milo:1", + "--tag", + "data:[dummy hash for task-2]", + "--tag", + "name:task-2", + "--tag", + "os:Linux", + "--tag", + "revision:abc123", + "--tag", + "stepname:task-2", + "[dummy hash for task-2]" + ], + "infra_step": true, + "name": "[trigger] task-2", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"task-2/Linux/[dummy has\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-2/Linux/[dummy has\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "task-3/Linux/[dummy has", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "os", + "Linux", + "--tag", + "allow_milo:1", + "--tag", + "data:[dummy hash for task-3]", + "--tag", + "name:task-3", + "--tag", + "os:Linux", + "--tag", + "revision:abc123", + "--tag", + "stepname:task-3", + "[dummy hash for task-3]" + ], + "infra_step": true, + "name": "[trigger] task-3", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"task-3/Linux/[dummy has\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-3/Linux/[dummy has\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "task-0/Linux/[dummy has", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "os", + "Linux", + "--tag", + "allow_milo:1", + "--tag", + "data:[dummy hash for task-0]", + "--tag", + "name:task-0", + "--tag", + "os:Linux", + "--tag", + "revision:abc123", + "--tag", + "stepname:task-0", + "[dummy hash for task-0]" + ], + "infra_step": true, + "name": "[trigger] task-0", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"task-0/Linux/[dummy has\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-0/Linux/[dummy has\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "trigger", + "--swarming", + "https://chromium-swarm.appspot.com", + "--isolate-server", + "https://isolateserver.appspot.com", + "--priority", + "90", + "--shards", + "1", + "--task-name", + "task-1/Linux/[dummy has", + "--dump-json", + "/path/to/tmp/json", + "--expiration", + "72000", + "--io-timeout", + "2400", + "--hard-timeout", + "14400", + "--dimension", + "os", + "Linux", + "--tag", + "allow_milo:1", + "--tag", + "data:[dummy hash for task-1]", + "--tag", + "name:task-1", + "--tag", + "os:Linux", + "--tag", + "revision:abc123", + "--tag", + "stepname:task-1", + "[dummy hash for task-1]" + ], + "infra_step": true, + "name": "[trigger] task-1", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'@@@", + "@@@STEP_LOG_LINE@json.output@{@@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"task-1/Linux/[dummy has\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"task-1/Linux/[dummy has\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@}@@@", + "@@@STEP_LOG_END@json.output@@@", + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"task-4/Linux/[dummy has\", \"tasks\": {\"task-4/Linux/[dummy has\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/task-4" + ], + "name": "task-4", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@swarming.summary@{@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 5.7, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 31.5@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs_ref\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ]@@@", + "@@@STEP_LOG_LINE@swarming.summary@}@@@", + "@@@STEP_LOG_END@swarming.summary@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"task-2/Linux/[dummy has\", \"tasks\": {\"task-2/Linux/[dummy has\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/task-2" + ], + "name": "task-2", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@swarming.summary@{@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 5.7, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 31.5@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs_ref\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ]@@@", + "@@@STEP_LOG_LINE@swarming.summary@}@@@", + "@@@STEP_LOG_END@swarming.summary@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"task-3/Linux/[dummy has\", \"tasks\": {\"task-3/Linux/[dummy has\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/task-3" + ], + "name": "task-3", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@swarming.summary@{@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 5.7, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 31.5@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs_ref\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ]@@@", + "@@@STEP_LOG_LINE@swarming.summary@}@@@", + "@@@STEP_LOG_END@swarming.summary@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"task-0/Linux/[dummy has\", \"tasks\": {\"task-0/Linux/[dummy has\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/task-0" + ], + "name": "task-0", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@swarming.summary@{@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 5.7, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 31.5@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs_ref\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ]@@@", + "@@@STEP_LOG_LINE@swarming.summary@}@@@", + "@@@STEP_LOG_END@swarming.summary@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "[START_DIR]/swarming.client/swarming.py", + "collect", + "--swarming", + "https://chromium-swarm.appspot.com", + "--decorate", + "--print-status-updates", + "--json", + "{\"base_task_name\": \"task-1/Linux/[dummy has\", \"tasks\": {\"task-1/Linux/[dummy has\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "--task-summary-json", + "/path/to/tmp/json", + "--task-output-dir", + "[START_DIR]/swarming_temp_dir/outputs/task-1" + ], + "name": "task-1", + "~followup_annotations": [ + "@@@STEP_TEXT@Run on OS: 'Linux'<br>swarming pending 71s@@@", + "@@@STEP_LOG_LINE@swarming.summary@{@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"shards\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"abandoned_ts\": null, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"bot_id\": \"vm30\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"durations\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 5.7, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 31.5@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"exit_codes\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ 0@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"id\": \"148aa78d7aa0000\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"internal_failure\": false, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated_out\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolated\": \"abc123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"namespace\": \"default-gzip\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs\": [@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Heart beat succeeded on win32.\\n\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"Foo\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ], @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"outputs_ref\": {@@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"view_url\": \"blah\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"state\": 112, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"try_number\": 1, @@@", + "@@@STEP_LOG_LINE@swarming.summary@ \"user\": \"unknown\"@@@", + "@@@STEP_LOG_LINE@swarming.summary@ }@@@", + "@@@STEP_LOG_LINE@swarming.summary@ ]@@@", + "@@@STEP_LOG_LINE@swarming.summary@}@@@", + "@@@STEP_LOG_END@swarming.summary@@@", + "@@@STEP_LINK@shard #0 isolated out@blah@@@", + "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/swarming/example.py b/infra/bots/recipe_modules/swarming/example.py new file mode 100644 index 0000000000..d862c480a6 --- /dev/null +++ b/infra/bots/recipe_modules/swarming/example.py @@ -0,0 +1,30 @@ +# Copyright 2017 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. + + +DEPS = [ + 'recipe_engine/path', + 'recipe_engine/properties', + 'recipe_engine/step', + 'swarming', +] + + +def RunSteps(api): + api.swarming.setup('mydir', swarming_rev='abc123') + api.swarming.create_isolated_gen_json( + 'isolate_path', 'isolate_dir', 'linux', 'task', {'myvar': 'myval'}) + tasks_to_hashes = api.swarming.batcharchive(targets=[ + 'task-%s' % num for num in range(5)]) + tasks = api.swarming.trigger_swarming_tasks( + tasks_to_hashes, dimensions={'os': 'Linux'}) + for t in tasks: + api.swarming.collect_swarming_task(t) + + +def GenTests(api): + yield ( + api.test('test') + + api.properties(revision='abc123') + ) diff --git a/infra/bots/recipe_modules/vars/__init__.py b/infra/bots/recipe_modules/vars/__init__.py index d5cf1da80b..e0e951379f 100644 --- a/infra/bots/recipe_modules/vars/__init__.py +++ b/infra/bots/recipe_modules/vars/__init__.py @@ -12,7 +12,3 @@ DEPS = [ 'recipe_engine/raw_io', 'recipe_engine/step', ] - - -# TODO(borenet): Add coverage -DISABLE_STRICT_COVERAGE = True diff --git a/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/vars/example.expected/Housekeeper-Weekly-RecreateSKPs.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json b/infra/bots/recipe_modules/vars/example.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json b/infra/bots/recipe_modules/vars/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/command_buffer.json b/infra/bots/recipe_modules/vars/example.expected/command_buffer.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/command_buffer.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/flutter_trybot.json b/infra/bots/recipe_modules/vars/example.expected/flutter_trybot.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/flutter_trybot.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/linux.json b/infra/bots/recipe_modules/vars/example.expected/linux.json new file mode 100644 index 0000000000..7726ecb249 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/linux.json @@ -0,0 +1,7 @@ +[ + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/pdfium_trybot.json b/infra/bots/recipe_modules/vars/example.expected/pdfium_trybot.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/pdfium_trybot.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/test.json b/infra/bots/recipe_modules/vars/example.expected/test.json new file mode 100644 index 0000000000..7726ecb249 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/test.json @@ -0,0 +1,7 @@ +[ + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/win.json b/infra/bots/recipe_modules/vars/example.expected/win.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/win.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.expected/win_test.json b/infra/bots/recipe_modules/vars/example.expected/win_test.json new file mode 100644 index 0000000000..4594f9e6b9 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.expected/win_test.json @@ -0,0 +1,35 @@ +[ + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/vars/example.py b/infra/bots/recipe_modules/vars/example.py new file mode 100644 index 0000000000..917f85db06 --- /dev/null +++ b/infra/bots/recipe_modules/vars/example.py @@ -0,0 +1,108 @@ +# Copyright 2017 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. + + +DEPS = [ + 'recipe_engine/properties', + 'vars', +] + + +def RunSteps(api): + api.vars.setup() + info = [ + api.vars.upload_dm_results, + api.vars.upload_perf_results, + api.vars.swarming_bot_id, + api.vars.swarming_task_id, + ] + assert len(info) == 4 # Make pylint happy. + + +def GenTests(api): + buildername = 'Build-Win-MSVC-x86_64-Release-Vulkan' + yield ( + api.test('win') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + ) + + buildername = 'Build-Mac-Clang-x86_64-Debug-CommandBuffer' + yield ( + api.test('command_buffer') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]') + ) + + buildername = 'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug' + yield ( + api.test('win_test') + + api.properties(buildername=buildername, + repository='https://skia.googlesource.com/skia.git', + revision='abc123', + path_config='kitchen', + swarm_out_dir='[SWARM_OUT_DIR]', + patch_storage='gerrit') + + api.properties.tryserver( + buildername=buildername, + gerrit_project='skia', + gerrit_url='https://skia-review.googlesource.com/', + ) + ) + + builder = 'Housekeeper-Weekly-RecreateSKPs' + yield ( + 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]') + ) + + builder = 'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug' + yield ( + 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]') + ) + + builder = 'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN' + yield ( + 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]') + ) + + builder = 'Build-Ubuntu-GCC-x86_64-Release-PDFium' + yield ( + 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]') + ) + + builder = 'Build-Ubuntu-GCC-x86_64-Release-Flutter_Android' + yield ( + 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]') + ) diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json index 1ac10efcaf..326480c3b4 100644 --- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json +++ b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index 3541fdaeb1..05e3baf973 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 2bd65cbf9b..015f2e3d10 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index de653f3729..2d6a0427bf 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index ee85f99d4d..45b44ac460 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -24,6 +24,92 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://chromium.googlesource.com/chromium/src.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git remote set-url (2)" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git fetch (2)" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/lkgr" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git reset (2)" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git clean (2)" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index 6edbab320d..f5fa0da7de 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json index bb233a2977..1e7709472d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json index 120d36ae45..21d92ca8e4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json index 23b71a5f3a..e2c5df1b86 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json index 1d48ecc50f..09826ed28c 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json index 09ceae2c21..8cee0450b4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 8efd793b6c..1de494a6c1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json index ff71d1bc4f..d1804c3094 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json index dfba52fa6a..f1c80cabcc 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index a48a946b11..b51130bb2e 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 3864089435..da92e552d6 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 664ba6eb2c..727343534f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json index 8aff336262..bedd440caa 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index b87dc7175f..151d680d5d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 89da4b8ed2..b720f7ed0a 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 865d7fa680..17b9d8f298 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 46ac766235..cdee3af4b9 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index a3b99cb9e6..cd686bbc3f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index f9ed735352..0be40aaaa4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 3853b2a579..dd4389f2a5 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://github.com/flutter/engine.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 334d30df85..c515ae3886 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 7fe0c9b637..a24b02f8f6 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://pdfium.googlesource.com/pdfium.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index 61f20f8d10..26281de585 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://pdfium.googlesource.com/pdfium.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 7051e2c8a5..e35c0447f6 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index 01b7334709..7247aab913 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index e82f1bea37..5d3c02a4a9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 92c4e022e7..afad99622f 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index 99a3e4a5e4..52236f984f 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 02e55a7dd3..d00e4dd39b 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json index f90fdb0c51..ea1a48fbb5 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index b209be1718..2ee72a9c8f 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py", diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index 2db788f642..1e05e269be 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/other_repo.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/other_repo", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/other_repo", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/other_repo", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/other_repo", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index f59fbb6d30..ebcfe63133 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://github.com/flutter/engine.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/flutter/src/flutter", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index 307da79c38..c86a7c4055 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://pdfium.googlesource.com/pdfium.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/pdfium", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 26744ef542..e3a384eaad 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git.bat", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git.bat", + "fetch" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git.bat", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git.bat", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index f148514593..eb2c940d1d 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index 2cb7ff516d..5d8c30724c 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index 0a0363387e..5eff72a1e1 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 0e3ecb40ce..88d3d04f88 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/master" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", @@ -384,7 +427,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave1" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -397,7 +440,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave1", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1", "511" ], "name": "makedirs slave1", @@ -432,7 +475,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/8/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/9/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave1" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], "infra_step": true, "name": "gsutil cp" @@ -464,7 +507,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], "name": "Write ct-dm-1.isolated.gen.json" @@ -475,7 +518,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave2" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -488,7 +531,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave2", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2", "511" ], "name": "makedirs slave2", @@ -523,7 +566,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/18/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/19/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave2" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], "infra_step": true, "name": "gsutil cp (2)" @@ -555,7 +598,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], "name": "Write ct-dm-2.isolated.gen.json" @@ -566,7 +609,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave3" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -579,7 +622,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave3", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3", "511" ], "name": "makedirs slave3", @@ -614,7 +657,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/28/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/29/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave3" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], "infra_step": true, "name": "gsutil cp (3)" @@ -646,7 +689,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], "name": "Write ct-dm-3.isolated.gen.json" @@ -657,7 +700,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave4" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -670,7 +713,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave4", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4", "511" ], "name": "makedirs slave4", @@ -705,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/38/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/39/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave4" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], "infra_step": true, "name": "gsutil cp (4)" @@ -737,7 +780,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], "name": "Write ct-dm-4.isolated.gen.json" @@ -748,7 +791,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave5" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -761,7 +804,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave5", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5", "511" ], "name": "makedirs slave5", @@ -796,7 +839,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/48/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/49/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/slave5" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], "infra_step": true, "name": "gsutil cp (5)" @@ -828,7 +871,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], "name": "Write ct-dm-5.isolated.gen.json" @@ -839,10 +882,10 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "{\"chromium_build\": \"fad657e-276e633\", \"num_slaves\": 5, \"page_type\": \"10k\"}", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/skps_version" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/skps_version" + "name": "Create [CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" }, { "cmd": [ @@ -890,7 +933,7 @@ "--shards", "1", "--task-name", - "ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571", + "ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -911,7 +954,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -933,9 +976,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -961,7 +1004,7 @@ "--shards", "1", "--task-name", - "ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571", + "ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -982,7 +1025,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1004,9 +1047,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1032,7 +1075,7 @@ "--shards", "1", "--task-name", - "ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571", + "ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1053,7 +1096,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1075,9 +1118,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1103,7 +1146,7 @@ "--shards", "1", "--task-name", - "ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571", + "ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1124,7 +1167,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1146,9 +1189,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1174,7 +1217,7 @@ "--shards", "1", "--task-name", - "ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571", + "ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1195,7 +1238,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1217,9 +1260,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1242,7 +1285,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1307,7 +1350,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1372,7 +1415,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1437,7 +1480,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1502,7 +1545,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\", \"tasks\": {\"ct-dm-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index 1c12f21f1f..10fab8ac60 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index ce91cc799b..d5be990eb0 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index f2dcb1163e..3d3e91ca31 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index f79abc71b2..4901eca1b9 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 456e8eb912..01630a53ab 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index be747afb0c..e9ef0d6390 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 9235c24c18..85ea0e7bbb 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index f8b4dacd4b..f97538376b 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", @@ -384,7 +427,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave1" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -397,7 +440,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave1", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1", "511" ], "name": "makedirs slave1", @@ -432,7 +475,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/8/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/9/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/10/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave1" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], "infra_step": true, "name": "gsutil cp" @@ -464,7 +507,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-1.isolated.gen.json" @@ -475,7 +518,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave2" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -488,7 +531,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave2", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2", "511" ], "name": "makedirs slave2", @@ -523,7 +566,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/18/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/19/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/20/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave2" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], "infra_step": true, "name": "gsutil cp (2)" @@ -555,7 +598,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-2.isolated.gen.json" @@ -566,7 +609,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave3" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -579,7 +622,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave3", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3", "511" ], "name": "makedirs slave3", @@ -614,7 +657,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/28/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/29/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/30/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave3" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], "infra_step": true, "name": "gsutil cp (3)" @@ -646,7 +689,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-3.isolated.gen.json" @@ -657,7 +700,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave4" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -670,7 +713,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave4", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4", "511" ], "name": "makedirs slave4", @@ -705,7 +748,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/38/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/39/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/40/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave4" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], "infra_step": true, "name": "gsutil cp (4)" @@ -737,7 +780,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-4.isolated.gen.json" @@ -748,7 +791,7 @@ "-u", "RECIPE_MODULE[build::file]/resources/fileutil.py", "rmtree", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave5" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], "env": { "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" @@ -761,7 +804,7 @@ "python", "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave5", + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5", "511" ], "name": "makedirs slave5", @@ -796,7 +839,7 @@ "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/48/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/49/*.skp", "gs://cluster-telemetry/swarming/skps/10k/fad657e-276e633/50/*.skp", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/slave5" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], "infra_step": true, "name": "gsutil cp (5)" @@ -828,7 +871,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", + "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], "name": "Write ct-get_images_from_skps-5.isolated.gen.json" @@ -839,10 +882,10 @@ "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "{\"chromium_build\": \"fad657e-276e633\", \"num_slaves\": 5, \"page_type\": \"10k\"}", - "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/skps_version" + "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" ], "infra_step": true, - "name": "Create [CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/skps_version" + "name": "Create [CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" }, { "cmd": [ @@ -890,7 +933,7 @@ "--shards", "1", "--task-name", - "ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571", + "ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -911,7 +954,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -935,9 +978,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -963,7 +1006,7 @@ "--shards", "1", "--task-name", - "ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571", + "ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -984,7 +1027,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1008,9 +1051,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1036,7 +1079,7 @@ "--shards", "1", "--task-name", - "ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571", + "ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1057,7 +1100,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1081,9 +1124,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1109,7 +1152,7 @@ "--shards", "1", "--task-name", - "ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571", + "ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1130,7 +1173,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1154,9 +1197,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1182,7 +1225,7 @@ "--shards", "1", "--task-name", - "ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571", + "ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571", "--dump-json", "/path/to/tmp/json", "--expiration", @@ -1203,7 +1246,7 @@ "--tag", "allow_milo:1", "--tag", - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot", + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs", "--tag", "buildnumber:571", "--tag", @@ -1227,9 +1270,9 @@ "~followup_annotations": [ "@@@STEP_TEXT@Run on OS: 'Ubuntu-14.04'@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", @@@", "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@", "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@", "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@", @@ -1252,7 +1295,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-1/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1317,7 +1360,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-2/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1382,7 +1425,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-3/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1447,7 +1490,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-4/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", @@ -1512,7 +1555,7 @@ "--decorate", "--print-status-updates", "--json", - "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs_Trybot/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", + "{\"base_task_name\": \"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\", \"tasks\": {\"ct-get_images_from_skps-5/Ubuntu-14.04/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}", "--task-summary-json", "/path/to/tmp/json", "--task-output-dir", diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py index 5eb81e3d1f..83bbf10243 100644 --- a/infra/bots/recipes/ct_skps.py +++ b/infra/bots/recipes/ct_skps.py @@ -421,7 +421,7 @@ def GenTests(api): ) ) - builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs-Trybot' + builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs' yield( api.test('CT_DM_10k_SKPs_Trybot') + api.properties( @@ -440,7 +440,7 @@ def GenTests(api): ) builder = ('Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_' - '10k_SKPs_Trybot') + '10k_SKPs') yield( api.test('CT_IMG_DECODE_10k_SKPs_Trybot') + api.properties( diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 96e434cd23..459ab535ca 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index 64a91a8dbd..844ea34110 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/housekeeper.py b/infra/bots/recipes/housekeeper.py index e62edd6383..af2ad4da82 100644 --- a/infra/bots/recipes/housekeeper.py +++ b/infra/bots/recipes/housekeeper.py @@ -17,16 +17,6 @@ DEPS = [ ] -TEST_BUILDERS = { - 'client.skia.fyi': { - 'skiabot-linux-housekeeper-000': [ - 'Housekeeper-PerCommit', - 'Housekeeper-PerCommit-Trybot', - ], - }, -} - - def RunSteps(api): # Checkout, compile, etc. api.core.setup() diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index 48fef46f44..4911cece29 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index f626748982..a748f46577 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index 0152483509..d100cace83 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -24,6 +24,49 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 84506ff52a..90b6d06184 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -24,6 +24,92 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://chromium.googlesource.com/chromium/src.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git remote set-url (2)" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git fetch (2)" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/lkgr" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git reset (2)" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git clean (2)" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 9dd260936b..79b0bbea96 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -24,6 +24,92 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://chromium.googlesource.com/chromium/src.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git remote set-url (2)" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git fetch (2)" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/lkgr" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git reset (2)" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git clean (2)" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 517e6eed3b..f72bf69541 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -24,6 +24,92 @@ }, { "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://skia.googlesource.com/skia.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git remote set-url" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git fetch" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "abc123" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git reset" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "infra_step": true, + "name": "git clean" + }, + { + "cmd": [ + "git", + "remote", + "set-url", + "origin", + "https://chromium.googlesource.com/chromium/src.git" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git remote set-url (2)" + }, + { + "cmd": [ + "git", + "fetch" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git fetch (2)" + }, + { + "cmd": [ + "git", + "reset", + "--hard", + "origin/lkgr" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git reset (2)" + }, + { + "cmd": [ + "git", + "clean", + "-d", + "-f" + ], + "cwd": "[CUSTOM_/_B_WORK]/src", + "infra_step": true, + "name": "git clean (2)" + }, + { + "cmd": [ "python", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json index f30b4cac30..529b0d8e29 100644 --- a/infra/bots/recipes/upload_dm_results.expected/trybot.json +++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json @@ -101,7 +101,7 @@ "-z", "json,log", "[START_DIR]/tmp_upload/*", - "gs://skia-infra-gm/trybot/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/1337000001/456789/12" + "gs://skia-infra-gm/trybot/dm-json-v1/2012/05/14/12/abc123/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/1337000001/456789/12" ], "name": "upload JSON and logs" }, diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index d485475acb..562d6e589d 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -128,7 +128,7 @@ def GenTests(api): api.step_data('upload images (attempt 5)', retcode=1) ) - builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot' + builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug' yield ( api.test('trybot') + api.properties( diff --git a/infra/bots/recipes/upload_nano_results.expected/trybot.json b/infra/bots/recipes/upload_nano_results.expected/trybot.json index bbebf80e1e..a601095619 100644 --- a/infra/bots/recipes/upload_nano_results.expected/trybot.json +++ b/infra/bots/recipes/upload_nano_results.expected/trybot.json @@ -5,9 +5,9 @@ "-u", "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", "/path/to/tmp/", - "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/*.json" + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/*.json" ], - "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data", + "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", "infra_step": true, "name": "find results" }, @@ -17,8 +17,8 @@ "cp", "-z", "json", - "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/data/nanobench_abc123.json", - "gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/456789/12/nanobench_abc123.json" + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/nanobench_abc123.json", + "gs://skia-perf/trybot/nano-json-v1/2012/05/14/12/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/456789/12/nanobench_abc123.json" ], "infra_step": true, "name": "upload" diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index e540ea402e..8d917ddaf1 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -62,7 +62,7 @@ def GenTests(api): path_config='kitchen') ) - builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot' + builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug' yield ( api.test('trybot') + api.properties(buildername=builder, |