diff options
author | borenet <borenet@chromium.org> | 2016-10-25 05:26:14 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-25 05:26:14 -0700 |
commit | 8fa7470b0f4dc64b8f7f2f877c726f50f7773115 (patch) | |
tree | c03f741228ddd8e6f801d38e4c96e231703c20cf /infra | |
parent | 5934646b4937a05d5e8297448ea6613a89f8903a (diff) |
Change recipes to use bot_update
NOTREECHECKS=true
BUG=skia:5588
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2448973002
Review-Url: https://codereview.chromium.org/2448973002
Diffstat (limited to 'infra')
50 files changed, 1739 insertions, 4009 deletions
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index a2591dcbee..5d4d7a3ccb 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -108,40 +108,18 @@ class SkiaApi(recipe_api.RecipeApi): pdfium.revision = 'origin/master' self.update_repo(self.m.vars.checkout_root, pdfium) - # Run 'gclient sync'. + # Run bot_update. gclient_cfg.got_revision_mapping['skia'] = 'got_revision' checkout_kwargs = {} checkout_kwargs['env'] = self.m.vars.default_env - # api.gclient.revert() assumes things about the layout of the code, so it - # fails for us. Run an appropriate revert sequence for trybots instead. - gclient_file = self.m.vars.checkout_root.join('.gclient') - if (self.m.tryserver.is_tryserver and - self.m.path.exists(gclient_file)): # pragma: no cover - # These steps taken from: - # https://chromium.googlesource.com/chromium/tools/build/+/ - # 81a696760ab7c25f6606c54fc781b90b8af9fdd2/scripts/slave/ - # gclient_safe_revert.py - if self.m.path.exists(entries_file): - self.m.gclient('recurse', [ - 'recurse', '-i', 'sh', '-c', - 'if [ -e .git ]; then git remote update; fi']) - self.m.gclient( - 'revert', - ['revert', '-v', '-v', '-v', '--nohooks', '--upstream'], - cwd=self.m.vars.checkout_root) - - update_step = self.m.gclient.checkout(gclient_config=gclient_cfg, - cwd=self.m.vars.checkout_root, - revert=False, - **checkout_kwargs) + update_step = self.m.bot_update.ensure_checkout( + gclient_config=gclient_cfg, + cwd=self.m.vars.checkout_root, + **checkout_kwargs) self.m.vars.got_revision = ( update_step.presentation.properties['got_revision']) - self.m.tryserver.maybe_apply_issue() - if self.m.properties.get('patch_storage') == 'gerrit': - self.m.bot_update.apply_gerrit_ref( - root=str(self.m.vars.checkout_root.join('skia'))) if self.m.vars.need_chromium_checkout: self.m.gclient.runhooks(cwd=self.m.vars.checkout_root, diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index ef5134d956..53fc82ea51 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -25,63 +25,57 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ \"src/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -89,46 +83,6 @@ "python", "-u", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json index 15feac8777..6fea641b82 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -25,63 +25,57 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ \"src/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -89,46 +83,6 @@ "python", "-u", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json index a198dfee12..fd7abc45bb 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json @@ -25,63 +25,57 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ \"src/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -89,46 +83,6 @@ "python", "-u", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json index 0efa47d320..2bab399235 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json @@ -25,102 +25,58 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/platform_tools/ios/bin/ios_ninja" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -130,7 +86,7 @@ "CHROME_HEADLESS": "1", "CXX": "/usr/bin/clang++", "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, "name": "build iOSShell" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json index 59bd389d04..aee4812e18 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json @@ -25,107 +25,63 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-mipsel-Debug-GN_Android" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -138,7 +94,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,7 +106,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 296bc17a28..c06693f21a 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -25,63 +25,57 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ \"src/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -89,46 +83,6 @@ "python", "-u", "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", @@ -155,7 +109,7 @@ "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "build command_buffer" @@ -168,7 +122,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -181,7 +135,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -193,7 +147,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json index afb2ad8b5d..5353b66ceb 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-GN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index 8e4a61b462..107a4efbfb 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -25,118 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--issue", + "500", + "--patchset", + "1", + "--rietveld_server", + "https://codereview.chromium.org", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "[DEPOT_TOOLS]/apply_issue.py", - "-r", - "[CUSTOM_/_B_WORK]/skia", - "-i", - "500", - "-p", - "1", - "-s", - "https://codereview.chromium.org", - "--no-auth" - ], - "name": "apply_issue", - "~followup_annotations": [ - "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -145,7 +87,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -158,7 +100,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -170,7 +112,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json index 99a7723f7a..8fcd8defd3 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json @@ -25,107 +25,63 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -138,7 +94,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,7 +106,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json index bdcdf42bae..2878d41976 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json @@ -25,107 +25,63 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -138,7 +94,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,7 +106,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json index bbe07cc530..1e36fd910b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan.json @@ -25,107 +25,63 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -138,7 +94,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -150,7 +106,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 2736afd54d..88157b55c1 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index 63a6c02458..d17042486d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json index c184198290..ddad689fe1 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index b92a4ea481..70399fb3d8 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index eb857e3e16..bc3eb0853d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 9d20fd3055..62f9b7c927 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-NoGPU" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index 54c6712ca3..37c47e668a 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index e9e752acc5..79a420a8f3 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-ANGLE" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 3dbcf3028b..466aaf6aeb 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Fast" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index f3f5490bdc..573574b1be 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Mesa" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 23ddaf7649..91700965c6 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -25,107 +25,61 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", + "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': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]", + "--patch_root", + "skia", + "--revision_mapping_file", + "{\"skia\": \"got_revision\"}", + "--git-cache-dir", + "[CUSTOM_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "pdfium@origin/master", - "--output-json", - "/path/to/tmp/json" + "--revision", + "skia@abc123", + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"pdfium/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d69d97171c17fdb12a52f78847e2ee2f0594eff1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ \"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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "gclient", "runhook", "gn_linux64" @@ -135,7 +89,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "GYP_DEFINES": "", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "runhook" @@ -150,7 +104,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "sysroot" @@ -168,7 +122,7 @@ "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "GYP_DEFINES": "", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "gn_gen" @@ -202,7 +156,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "sync_pdfium" @@ -220,7 +174,7 @@ "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", "GYP_DEFINES": "", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, "name": "build_pdfium" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index f7234aebe7..63274da4c4 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index e28bc5bc8c..39940cfc6e 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 90053e0740..6dd5403af8 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json index e10e98736f..33d499581d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json index 603bd8b076..062bda591b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index f3ccd72aa9..38aaabed3c 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 916b642db9..a0a86577d3 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -25,109 +25,65 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "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": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Release_x64", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -140,7 +96,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -152,7 +108,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json index 8edb3abc04..dd9a0ea9be 100644 --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json @@ -25,118 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--issue", + "2147533002", + "--patchset", + "1", + "--rietveld_server", + "https://codereview.chromium.org", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "[DEPOT_TOOLS]\\apply_issue.py", - "-r", - "[CUSTOM_C:\\_B_WORK]\\skia", - "-i", - "2147533002", - "-p", - "1", - "-s", - "https://codereview.chromium.org", - "--no-auth" - ], - "name": "apply_issue", - "~followup_annotations": [ - "@@@STEP_LINK@Applied issue 2147533002@https://codereview.chromium.org/2147533002@@@" + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -147,7 +89,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -160,7 +102,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -172,7 +114,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json index e77b41a023..dab9d349c9 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json @@ -25,121 +25,64 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--issue", + "500", + "--patchset", + "1", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[depot_tools::bot_update]\\resources\\apply_gerrit.py", - "--gerrit_repo", - "skia", - "--gerrit_ref", - "", - "--root", - "[CUSTOM_C:\\_B_WORK]\\skia" - ], - "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "apply_gerrit" - }, - { - "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", "[SLAVE_BUILD]\\tmp", "511" @@ -166,7 +109,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -179,7 +122,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -191,7 +134,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json index 20caf82614..ac8a58d5cb 100644 --- a/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json @@ -25,118 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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]", + "--issue", + "500", + "--patchset", + "1", + "--rietveld_server", + "https://codereview.chromium.org", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "[DEPOT_TOOLS]\\apply_issue.py", - "-r", - "[CUSTOM_C:\\_B_WORK]\\skia", - "-i", - "500", - "-p", - "1", - "-s", - "https://codereview.chromium.org", - "--no-auth" - ], - "name": "apply_issue", - "~followup_annotations": [ - "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -169,7 +111,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -182,7 +124,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -194,7 +136,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json index 3382821008..cc0eef6682 100644 --- a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json @@ -25,121 +25,64 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j2", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "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", + "skia", + "--gerrit_ref", + "refs/changes/00/2100/2", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_C:\\_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[depot_tools::bot_update]\\resources\\apply_gerrit.py", - "--gerrit_repo", - "skia", - "--gerrit_ref", - "refs/changes/00/2100/2", - "--root", - "[CUSTOM_C:\\_B_WORK]\\skia" - ], - "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "apply_gerrit" - }, - { - "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", "[SLAVE_BUILD]\\tmp", "511" @@ -166,7 +109,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -179,7 +122,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -191,7 +134,7 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 1ac96efbd1..a8345158ed 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index b6306ad2d0..af9a8d860a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index 8817125664..decaaea2c2 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 2908b23911..20abc3b545 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -25,118 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--issue", + "1499623002", + "--patchset", + "1", + "--rietveld_server", + "codereview.chromium.org", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@origin/master", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", + "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"skia\": \"origin/master\"@@@", + "@@@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@ }, @@@", + "@@@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\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "python", - "-u", - "[DEPOT_TOOLS]/apply_issue.py", - "-r", - "[CUSTOM_/_B_WORK]/skia", - "-i", - "1499623002", - "-p", - "1", - "-s", - "codereview.chromium.org", - "--no-auth" - ], - "name": "apply_issue", - "~followup_annotations": [ - "@@@STEP_LINK@Applied issue 1499623002@1499623002@@@" + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { @@ -169,7 +111,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -182,7 +124,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -194,7 +136,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index 9ca2b582c6..7256fa2ce2 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 702006c5d6..f64f333870 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 6e29f0c8dd..31504e6f35 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 780247bba6..4336eaf540 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 9feeb77d43..6db4b096ff 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index 0523523939..0b50b9678a 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 8b019691aa..49cc958cce 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 73f20fb0a4..e435141a6c 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -25,104 +25,60 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Debug", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "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", "[SLAVE_BUILD]/tmp", "511" @@ -149,7 +105,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "fetch-gn" }, @@ -162,7 +118,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gn gen" }, @@ -174,7 +130,7 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json index 9dfc5062d3..5f4b62b099 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_all_updates.json @@ -25,102 +25,58 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "go", "get", "-u", diff --git a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json index 96c7999563..d229d6f22d 100644 --- a/infra/bots/recipes/swarm_infra.expected/failed_one_update.json +++ b/infra/bots/recipes/swarm_infra.expected/failed_one_update.json @@ -25,102 +25,58 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "go", "get", "-u", diff --git a/infra/bots/recipes/swarm_infra.expected/infra_tests.json b/infra/bots/recipes/swarm_infra.expected/infra_tests.json index bd5ef5a272..fd4803ab36 100644 --- a/infra/bots/recipes/swarm_infra.expected/infra_tests.json +++ b/infra/bots/recipes/swarm_infra.expected/infra_tests.json @@ -25,102 +25,58 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "go", "get", "-u", diff --git a/infra/bots/recipes/swarm_presubmit.expected/presubmit.json b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json index 6eb60133a1..c6bcfa8af4 100644 --- a/infra/bots/recipes/swarm_presubmit.expected/presubmit.json +++ b/infra/bots/recipes/swarm_presubmit.expected/presubmit.json @@ -25,102 +25,58 @@ "cmd": [ "python", "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", + "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'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", + "cache_dir = '[CUSTOM_/_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_/_B_CACHE]", + "--output_json", + "/path/to/tmp/json", "--revision", "skia@abc123", - "--output-json", - "/path/to/tmp/json" + "--output_manifest" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[SLAVE_BUILD]/out" }, - "name": "gclient sync", + "name": "bot_update", "~followup_annotations": [ + "@@@STEP_TEXT@Some step text@@@", "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", + "@@@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@ }, @@@", + "@@@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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" ] }, { "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ "git", "checkout", "-b", |