| Index: infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json
|
| diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json
|
| similarity index 86%
|
| copy from infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
|
| copy to infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.json
|
| index 96cef6f4ed090c34b1221db73464e689b8f8c8d5..11352bc3811e0d6bbcd679bb1e3738f66f7dde95 100644
|
| --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
|
| +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs.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\": \"Build-Ubuntu-GCC-x86_64-Debug\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| + "{\"buildername\": \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| ],
|
| "name": "print properties",
|
| "~followup_annotations": [
|
| @@ -284,10 +284,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/ct_skps_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct_skps_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/ct_skps_skia.isolated.gen.json"
|
| ],
|
| - "name": "Write compile_skia.isolated.gen.json"
|
| + "name": "Write ct_skps_skia.isolated.gen.json"
|
| },
|
| {
|
| "cmd": [
|
| @@ -301,15 +301,15 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/ct_skps_skia.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ct_skps_skia\": \"[dummy hash for ct_skps_skia]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"compile_skia\": \"[dummy hash for compile_skia]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"ct_skps_skia\": \"[dummy hash for ct_skps_skia]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -327,7 +327,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug/5",
|
| + "ct_skps_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -337,26 +337,23 @@
|
| "--hard-timeout",
|
| "14400",
|
| "--dimension",
|
| - "gpu",
|
| - "none",
|
| - "--dimension",
|
| "os",
|
| "Ubuntu",
|
| "--dimension",
|
| "pool",
|
| - "Skia",
|
| + "SkiaCT",
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Build-Ubuntu-GCC-x86_64-Debug",
|
| + "buildername:Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| - "data:[dummy hash for compile_skia]",
|
| + "data:[dummy hash for ct_skps_skia]",
|
| "--tag",
|
| "master:client.skia",
|
| "--tag",
|
| - "name:compile_skia",
|
| + "name:ct_skps_skia",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -364,27 +361,26 @@
|
| "--tag",
|
| "slavename:skiabot-linux-swarm-000",
|
| "--tag",
|
| - "stepname:compile_skia on Ubuntu",
|
| - "--idempotent",
|
| - "[dummy hash for compile_skia]",
|
| + "stepname:ct_skps_skia on Ubuntu",
|
| + "[dummy hash for ct_skps_skia]",
|
| "--",
|
| "--workdir",
|
| "../../..",
|
| - "swarm_compile",
|
| - "buildername=Build-Ubuntu-GCC-x86_64-Debug",
|
| - "mastername=client.skia.compile",
|
| - "buildnumber=1",
|
| - "slavename=skiabot-dummy-compile-slave",
|
| + "swarm_ct_skps",
|
| + "buildername=Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
|
| + "mastername=client.skia",
|
| + "buildnumber=5",
|
| + "slavename=skiabot-linux-swarm-000",
|
| "reason=Triggered by Skia swarm_trigger Recipe",
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "revision=abc123"
|
| ],
|
| - "name": "[trigger] compile_skia on Ubuntu",
|
| + "name": "[trigger] ct_skps_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"ct_skps_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ct_skps_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/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,11 +403,11 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"ct_skps_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/5\", \"tasks\": {\"ct_skps_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "compile_skia on Ubuntu",
|
| + "name": "ct_skps_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
|
|