| Index: infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| similarity index 94%
|
| copy from infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
|
| copy to infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| index c4cad61129993e6e420642faf03d168fd091dd05..246f91d326cf606bc197eaa608b8bc1a46a73bf5 100644
|
| --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
|
| +++ b/infra/bots/recipes/swarm_trigger.expected/recipe_with_gerrit_patch.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n",
|
| - "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| + "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot\", \"buildnumber\": 5, \"event.change.number\": \"2100\", \"event.patchSet.ref\": \"refs/changes/00/2100/2\", \"mastername\": \"client.skia\", \"patch_storage\": \"gerrit\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"repository\": \"skia\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| ],
|
| "name": "print properties",
|
| "~followup_annotations": [
|
| @@ -327,7 +327,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5",
|
| + "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -348,7 +348,7 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
|
| + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| @@ -371,20 +371,24 @@
|
| "--workdir",
|
| "../../..",
|
| "swarm_compile",
|
| - "buildername=Build-Ubuntu-GCC-x86_64-Debug",
|
| + "event.change.number=2100",
|
| + "repository=skia",
|
| + "buildername=Build-Ubuntu-GCC-x86_64-Debug-Trybot",
|
| "mastername=client.skia.compile",
|
| + "patch_storage=gerrit",
|
| "buildnumber=1",
|
| "slavename=skiabot-dummy-compile-slave",
|
| "reason=Triggered by Skia swarm_trigger Recipe",
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| + "event.patchSet.ref=refs/changes/00/2100/2",
|
| "revision=abc123"
|
| ],
|
| "name": "[trigger] compile_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -407,7 +411,7 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -593,7 +597,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5",
|
| + "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -617,7 +621,7 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
|
| + "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| @@ -645,20 +649,24 @@
|
| "--workdir",
|
| "../../..",
|
| "swarm_test",
|
| - "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
|
| + "event.change.number=2100",
|
| + "repository=skia",
|
| + "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot",
|
| "mastername=client.skia",
|
| + "patch_storage=gerrit",
|
| "buildnumber=5",
|
| "slavename=skiabot-linux-swarm-000",
|
| "reason=Triggered by Skia swarm_trigger Recipe",
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| + "event.patchSet.ref=refs/changes/00/2100/2",
|
| "revision=abc123"
|
| ],
|
| "name": "[trigger] test_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -703,7 +711,7 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| @@ -794,9 +802,9 @@
|
| "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py",
|
| "[SLAVE_BUILD]/dm",
|
| "abc123",
|
| - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
|
| + "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot",
|
| "5",
|
| - "",
|
| + "2100",
|
| "[SLAVE_BUILD]/skia/common/py/utils"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/skia",
|
|
|