| Index: scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| index 9f0ec6075697491b20ffb72208174d583270ae1a..5a998391da25559b5037f83709fc3bc19b794b16 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| @@ -356,7 +356,7 @@
|
| "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 \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"BUILDER_NAME\", \n \"Build-Ubuntu-GCC-x86_64-Release-Swarming\"\n ], \n \"dir\": \"[SLAVE_BUILD]/skia/infra/bots\", \n \"version\": 1\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 \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -390,6 +390,43 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\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-compile_skia.isolated",
|
| + "8ba778e47df2a9b46355cf72c58b58fdb1a7f350"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "add_isolated_input",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import json@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/swarming.client/isolateserver.py",
|
| + "archive",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "upload new .isolated file for compile_skia",
|
| + "stdout": "/path/to/tmp/"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| @@ -401,7 +438,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5",
|
| + "compile_skia/Ubuntu/def456/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -424,7 +461,7 @@
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| - "data:[dummy hash for compile_skia]",
|
| + "data:def456",
|
| "--tag",
|
| "master:client.skia.fyi",
|
| "--tag",
|
| @@ -438,15 +475,27 @@
|
| "--tag",
|
| "stepname:compile_skia on Ubuntu",
|
| "--idempotent",
|
| - "[dummy hash for compile_skia]"
|
| + "def456",
|
| + "--",
|
| + "cook",
|
| + "-repository",
|
| + "https://chromium.googlesource.com/chromium/tools/build",
|
| + "-revision",
|
| + "",
|
| + "-recipe",
|
| + "skia/swarm_compile",
|
| + "-properties",
|
| + "{\"rietveld\": \"https://codereview.chromium.org\", \"buildername\": \"Build-Ubuntu-GCC-x86_64-Release-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"patchset\": \"1\", \"issue\": \"500\", \"revision\": 164710}",
|
| + "-workdir",
|
| + "../../.."
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "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/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-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\"@@@",
|
| @@ -469,7 +518,7 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5",
|
| + "compile_skia/Ubuntu/def456/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/5",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -572,7 +621,7 @@
|
| "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/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \".git\", \n \"--extra-variable\", \n \"BUILD_NUMBER\", \n \"5\", \n \"--extra-variable\", \n \"MASTER_NAME\", \n \"client.skia.fyi\", \n \"--extra-variable\", \n \"SLAVE_NAME\", \n \"skiabot-linux-housekeeper-003\", \n \"--extra-variable\", \n \"BUILDER_NAME\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot\", \n \"--extra-variable\", \n \"PATCHSET\", \n \"1\", \n \"--extra-variable\", \n \"ISSUE\", \n \"500\", \n \"--extra-variable\", \n \"REVISION\", \n 164710\n ], \n \"dir\": \"[SLAVE_BUILD]/skia/infra/bots\", \n \"version\": 1\n}",
|
| + "{\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 \"linux\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -606,12 +655,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(sys.argv[2])\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
|
| + "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\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-perf_skia.isolated",
|
| - "abc123"
|
| + "abc123",
|
| + "8ba778e47df2a9b46355cf72c58b58fdb1a7f350"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "add_isolated_input",
|
| + "name": "add_isolated_input (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@import json@@@",
|
| @@ -619,7 +669,7 @@
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@",
|
| "@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@",
|
| "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
|
| "@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@",
|
| "@@@STEP_LOG_END@python.inline@@@"
|
| @@ -690,7 +740,19 @@
|
| "slavename:skiabot-linux-housekeeper-003",
|
| "--tag",
|
| "stepname:perf_skia on Ubuntu",
|
| - "def456"
|
| + "def456",
|
| + "--",
|
| + "cook",
|
| + "-repository",
|
| + "https://chromium.googlesource.com/chromium/tools/build",
|
| + "-revision",
|
| + "",
|
| + "-recipe",
|
| + "skia/swarm_perf",
|
| + "-properties",
|
| + "{\"rietveld\": \"https://codereview.chromium.org\", \"buildername\": \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"patchset\": \"1\", \"issue\": \"500\", \"revision\": 164710}",
|
| + "-workdir",
|
| + "../../.."
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] perf_skia on Ubuntu",
|
|
|