Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json

Issue 1829423002: Skia: Run recipes as swarming tasks (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@swarm_fix
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« scripts/slave/recipes/skia/swarm_trigger.py ('K') | « scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
index 1a4cee2831ef1883b1e39058ded3e1bf8c620210..4c6e4b8882bd467c30939b38a87e61d63379712b 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming.json
@@ -325,7 +325,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-Debug-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]",
@@ -359,6 +359,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",
@@ -370,7 +407,7 @@
"--shards",
"1",
"--task-name",
- "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -393,7 +430,7 @@
"--tag",
"buildnumber:5",
"--tag",
- "data:[dummy hash for compile_skia]",
+ "data:def456",
"--tag",
"master:client.skia.fyi",
"--tag",
@@ -405,15 +442,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",
+ "{\"buildername\": \"Build-Ubuntu-GCC-x86_64-Debug-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"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/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/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-Swarming/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/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\"@@@",
@@ -436,7 +485,7 @@
"--print-status-updates",
"--shards",
"1",
- "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
+ "compile_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming/5",
"--task-summary-json",
"/path/to/tmp/json"
],
@@ -539,7 +588,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/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_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 \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming\", \n \"--extra-variable\", \n \"PATCHSET\", \n \"\", \n \"--extra-variable\", \n \"ISSUE\", \n \"\", \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/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_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/test_skia.isolated.gen.json"
],
"cwd": "[SLAVE_BUILD]",
@@ -573,12 +622,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-test_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@@@",
@@ -586,7 +636,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@@@"
@@ -655,7 +705,19 @@
"slavename:skiabot-linux-housekeeper-003",
"--tag",
"stepname:test_skia on Ubuntu",
- "def456"
+ "def456",
+ "--",
+ "cook",
+ "-repository",
+ "https://chromium.googlesource.com/chromium/tools/build",
+ "-revision",
+ "",
+ "-recipe",
+ "skia/swarm_test",
+ "-properties",
+ "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"revision\": 164710}",
+ "-workdir",
+ "../../.."
],
"cwd": "[SLAVE_BUILD]",
"name": "[trigger] test_skia on Ubuntu",
@@ -702,7 +764,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 \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming\", \n \"--extra-variable\", \n \"PATCHSET\", \n \"\", \n \"--extra-variable\", \n \"ISSUE\", \n \"\", \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]",
@@ -736,12 +798,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 (2)",
+ "name": "add_isolated_input (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import json@@@",
@@ -749,7 +812,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@@@"
@@ -818,7 +881,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",
+ "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming\", \"mastername\": \"client.skia.fyi\", \"buildnumber\": 5, \"slavename\": \"skiabot-linux-housekeeper-003\", \"reason\": \"Triggered by Skia swarm_trigger Recipe\", \"swarm_out_dir\": \"${ISOLATED_OUTDIR}\", \"revision\": 164710}",
+ "-workdir",
+ "../../.."
],
"cwd": "[SLAVE_BUILD]",
"name": "[trigger] perf_skia on Ubuntu",
« scripts/slave/recipes/skia/swarm_trigger.py ('K') | « scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698