Skia: Run recipes as swarming tasks

scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json

 [
   {
     "cmd": [
       "git",
       "remote",
       "set-url",
       "origin",
       "https://skia.googlesource.com/skia.git"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 308 matching lines @@
       "@@@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        \"BUILDER_NAME\", \n        \"Build-Mac-Clang-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]",
     "name": "Write compile_skia.isolated.gen.json"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
@@ skipping 13 matching lines @@
       "@@@STEP_LOG_LINE@json.output@  \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"compile_skia\": \"[dummy hash for compile_skia]\"}@@@"
     ]
   },
   {
     "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",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "90",
       "--shards",
       "1",
       "--task-name",
-      "compile_skia/Mac/[dummy has/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "14400",
       "--io-timeout",
       "1200",
       "--hard-timeout",
       "3600",
       "--dimension",
       "gpu",
       "none",
       "--dimension",
       "os",
       "Mac",
       "--dimension",
       "pool",
       "Skia",
       "--tag",
       "buildername:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming",
       "--tag",
       "buildnumber:5",
       "--tag",
-      "data:[dummy hash for compile_skia]",
+      "data:def456",
       "--tag",
       "master:client.skia.fyi",
       "--tag",
       "name:compile_skia",
       "--tag",
       "os:Mac",
       "--tag",
       "slavename:skiabot-linux-housekeeper-003",
       "--tag",
       "stepname:compile_skia on Mac",
       "--idempotent",
-      "[dummy hash for compile_skia]"
+      "def456",
+      "--",
+      "cook",
+      "-repository",
+      "https://chromium.googlesource.com/chromium/tools/build",
+      "-revision",
+      "",
+      "-recipe",
+      "skia/swarm_compile",
+      "-properties",
+      "{\"buildername\": \"Build-Mac-Clang-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}\", \"revision\": 164710}",
+      "-workdir",
+      "../../.."
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] compile_skia on Mac",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Mac/[dummy has/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Mac/[dummy has/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-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\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
-      "compile_skia/Mac/[dummy has/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile_skia on Mac",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
@@ skipping 82 matching lines @@
       "@@@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/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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-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]",
     "name": "Write test_skia.isolated.gen.json"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
@@ skipping 13 matching lines @@
       "@@@STEP_LOG_LINE@json.output@  \"test_skia\": \"[dummy hash for test_skia]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"test_skia\": \"[dummy hash for test_skia]\"}@@@"
     ]
   },
   {
     "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@@@",
       "@@@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(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",
@@ skipping 48 matching lines @@
       "--tag",
       "master:client.skia.fyi",
       "--tag",
       "name:test_skia",
       "--tag",
       "os:Mac",
       "--tag",
       "slavename:skiabot-linux-housekeeper-003",
       "--tag",
       "stepname:test_skia on Mac",
-      "def456"
+      "def456",
+      "--",
+      "cook",
+      "-repository",
+      "https://chromium.googlesource.com/chromium/tools/build",
+      "-revision",
+      "",
+      "-recipe",
+      "skia/swarm_test",
+      "-properties",
+      "{\"buildername\": \"Test-Mac-Clang-MacMini6.2-CPU-AVX-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}\", \"revision\": 164710}",
+      "-workdir",
+      "../../.."
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] test_skia on Mac",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 138 matching lines @@
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
     "name": "Upload DM Results"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]