Fixes for SwarmBucket bot

infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json

 [
   {
     "cmd": [
+      "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\": \"Infra-PerCommit\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
+    ],
+    "name": "print properties",
+    "~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@@@@",
+      "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  content = json.load(f)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@print json.dumps(content, indent=2)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
       "git",
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[ROOT]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git rev-parse",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-c",
       "\"print 'abc123'\""
     ],
     "name": "got_revision",
     "~followup_annotations": [
       "@@@SET_BUILD_PROPERTY@got_revision@\"abc123\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "",
+      "[SLAVE_BUILD]/.gclient"
+    ],
+    "name": "write .gclient"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "import os\nfor r, _, files in os.walk(os.getcwd()):\n  for fname in files:\n    f = os.path.join(r, fname)\n    if os.path.isfile(f):\n      if os.access(f, os.X_OK):\n        os.chmod(f, 0755)\n      else:\n        os.chmod(f, 0644)\n"
     ],
-    "cwd": "[ROOT]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "fix filemodes",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@import os@@@",
       "@@@STEP_LOG_LINE@python.inline@for r, _, files in os.walk(os.getcwd()):@@@",
       "@@@STEP_LOG_LINE@python.inline@  for fname in files:@@@",
       "@@@STEP_LOG_LINE@python.inline@    f = os.path.join(r, fname)@@@",
       "@@@STEP_LOG_LINE@python.inline@    if os.path.isfile(f):@@@",
       "@@@STEP_LOG_LINE@python.inline@      if os.access(f, os.X_OK):@@@",
       "@@@STEP_LOG_LINE@python.inline@        os.chmod(f, 0755)@@@",
       "@@@STEP_LOG_LINE@python.inline@      else:@@@",
@@ skipping 93 matching lines @@
   },
   {
     "cmd": [
       "download_from_google_storage",
       "--no_resume",
       "--platform=linux*",
       "--no_auth",
       "--bucket",
       "chromium-luci",
       "-d",
-      "[ROOT]/skia/infra/bots/tools/luci-go/linux64"
+      "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
     ],
     "name": "download luci-go linux"
   },
   {
     "cmd": [
       "download_from_google_storage",
       "--no_resume",
       "--platform=darwin",
       "--no_auth",
       "--bucket",
       "chromium-luci",
       "-d",
-      "[ROOT]/skia/infra/bots/tools/luci-go/mac64"
+      "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
     ],
     "name": "download luci-go mac"
   },
   {
     "cmd": [
       "download_from_google_storage",
       "--no_resume",
       "--platform=win32",
       "--no_auth",
       "--bucket",
       "chromium-luci",
       "-d",
-      "[ROOT]/skia/infra/bots/tools/luci-go/win64"
+      "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
     ],
     "name": "download luci-go win"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[SLAVE_BUILD]/luci-go"
     ],
     "env": {
-      "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts"
+      "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
     },
     "name": "rmtree luci-go",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
-      "[ROOT]/skia/infra/bots/tools/luci-go",
+      "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go",
       "[SLAVE_BUILD]/luci-go",
       "0"
     ],
     "name": "Copy Go binary"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
@@ skipping 24 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        \"[ROOT]/skia/infra/bots/infra_skia.isolate\", \n        \"--isolated\", \n        \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-infra_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}",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[SLAVE_BUILD]/skia/infra/bots/infra_skia.isolate\", \n        \"--isolated\", \n        \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-infra_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/infra_skia.isolated.gen.json"
     ],
     "name": "Write infra_skia.isolated.gen.json"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
       "[SLAVE_BUILD]/swarming.client",
@@ skipping 156 matching lines @@
       "@@@STEP_LINK@shard #0 isolated out@blah@@@",
       "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]