Index: infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json |
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 62cb147ed49f41b9a2cc07c5f62150cfee50caba..440c2e97e2820774e0d5391e35a0f496330dd3d8 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,58 +25,64 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "config", |
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
+ "--master", |
+ "client.skia.compile", |
+ "--builder", |
+ "Build-Mac-Clang-x86_64-Debug-CommandBuffer", |
+ "--slave", |
+ "skiabot-linux-swarm-000", |
"--spec", |
- "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']" |
- ], |
- "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", |
- "--nohooks", |
- "--force", |
- "--verbose", |
- "--delete_unversioned_trees", |
+ "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['llvm']", |
+ "--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" |
+ "--force", |
+ "--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@ \"revision\": 164710@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkgr\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@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@164710@@@" |
+ "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@" |
] |
}, |
{ |
@@ -106,7 +112,7 @@ |
"CHROME_PATH": "[SLAVE_BUILD]/src", |
"CXX": "/usr/bin/clang++", |
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=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": "build most" |
@@ -131,7 +137,7 @@ |
"CHROME_PATH": "[SLAVE_BUILD]/src", |
"CXX": "/usr/bin/clang++", |
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=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": "build command_buffer" |