| Index: infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| similarity index 93%
|
| copy from infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| copy to infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| index 58c36bc47b709565d8b8bae9c61610604ac243f1..4cfc441d5a213797cd97838afea016ee2b1e98dc 100644
|
| --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.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-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| + "{\"buildername\": \"Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"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-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
|
| + "compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -348,7 +348,7 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| + "buildername:Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| @@ -382,9 +382,9 @@
|
| "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-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/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 +407,7 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/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/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -513,10 +513,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/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_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/test_skia.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_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/perf_skia.isolated.gen.json"
|
| ],
|
| - "name": "Write test_skia.isolated.gen.json"
|
| + "name": "Write perf_skia.isolated.gen.json"
|
| },
|
| {
|
| "cmd": [
|
| @@ -530,15 +530,15 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
|
| ],
|
| "name": "isolate tests (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test_skia\": \"[dummy hash for test_skia]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"perf_skia\": \"[dummy hash for perf_skia]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test_skia\": \"[dummy hash for test_skia]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"perf_skia\": \"[dummy hash for perf_skia]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -546,7 +546,7 @@
|
| "python",
|
| "-u",
|
| "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated",
|
| "abc123"
|
| ],
|
| "name": "add_isolated_input",
|
| @@ -573,9 +573,9 @@
|
| "archive",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated"
|
| ],
|
| - "name": "upload new .isolated file for test_skia",
|
| + "name": "upload new .isolated file for perf_skia",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| @@ -593,7 +593,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
|
| + "perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -614,7 +614,7 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| + "buildername:Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| @@ -622,7 +622,7 @@
|
| "--tag",
|
| "master:client.skia",
|
| "--tag",
|
| - "name:test_skia",
|
| + "name:perf_skia",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -630,7 +630,7 @@
|
| "--tag",
|
| "slavename:skiabot-linux-swarm-000",
|
| "--tag",
|
| - "stepname:test_skia on Ubuntu",
|
| + "stepname:perf_skia on Ubuntu",
|
| "--cipd-package",
|
| "skp:skia/bots/skp:version:0",
|
| "--cipd-package",
|
| @@ -641,8 +641,8 @@
|
| "--",
|
| "--workdir",
|
| "../../..",
|
| - "swarm_test",
|
| - "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| + "swarm_perf",
|
| + "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
|
| "mastername=client.skia",
|
| "buildnumber=5",
|
| "slavename=skiabot-linux-swarm-000",
|
| @@ -650,12 +650,12 @@
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "revision=abc123"
|
| ],
|
| - "name": "[trigger] test_skia on Ubuntu",
|
| + "name": "[trigger] perf_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-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/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\"@@@",
|
| @@ -678,11 +678,11 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/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": "test_skia on Ubuntu",
|
| + "name": "perf_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
|
|