Index: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json |
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json |
index b7c587c0e5f659e225377081f852f583494327b7..31f8e6381b8053b23bd841229d47a157e2efd237 100644 |
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json |
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json |
@@ -321,7 +321,65 @@ |
"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 \"[BUILD]/scripts/slave/recipes/skia/recipes.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n \"version\": 1\n}", |
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "Write isolate_recipes.isolated.gen.json" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py", |
+ "[SLAVE_BUILD]/swarming.client", |
+ "batcharchive", |
+ "--dump-json", |
+ "/path/to/tmp/json", |
+ "--isolate-server", |
+ "https://isolateserver.appspot.com", |
+ "--verbose", |
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "isolate tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"isolate_recipes\": \"[dummy hash for isolate_recipes]\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@", |
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"isolate_recipes\": \"[dummy hash for isolate_recipes]\"}@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
+ "[SLAVE_BUILD]/swarming_temp_dir", |
+ "511" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "makedirs swarming tmp dir (2)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", |
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", |
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "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 \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -342,7 +400,7 @@ |
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "isolate tests", |
+ "name": "isolate tests (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
"@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@", |
@@ -355,6 +413,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", |
+ "[dummy hash for isolate_recipes]" |
+ ], |
+ "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", |
@@ -366,7 +461,7 @@ |
"--shards", |
"1", |
"--task-name", |
- "compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5", |
+ "compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5", |
"--dump-json", |
"/path/to/tmp/json", |
"--expiration", |
@@ -389,7 +484,7 @@ |
"--tag", |
"buildnumber:5", |
"--tag", |
- "data:[dummy hash for compile_skia]", |
+ "data:def456", |
"--tag", |
"master:client.skia.fyi", |
"--tag", |
@@ -401,15 +496,21 @@ |
"--tag", |
"stepname:compile_skia on Ubuntu", |
"--idempotent", |
- "[dummy hash for compile_skia]" |
+ "def456", |
+ "--", |
+ "--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", |
+ "../../..", |
+ "skia/swarm_compile" |
], |
"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/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-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\"@@@", |
@@ -432,7 +533,7 @@ |
"--print-status-updates", |
"--shards", |
"1", |
- "compile_skia/Ubuntu/[dummy has/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5", |
+ "compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-x86_64-Debug-Swarming/5", |
"--task-summary-json", |
"/path/to/tmp/json" |
], |