Change all remote run builders to use tools/build.

scripts/slave/recipes/blink_downstream.expected/too_many_failures_for_retcode.json

 [
   {
     "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",
-      "[BUILDER_CACHE]/linux_layout",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64",
       "511"
     ],
     "name": "makedirs checkout path",
     "~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",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--patch_root",
       "src",
       "--revision_mapping_file",
-      "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+      "{\"src\": \"got_cr_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}",
       "--git-cache-dir",
       "[GIT_CACHE]",
-      "--issue",
-      "12853011",
-      "--patchset",
-      "1",
-      "--rietveld_server",
-      "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
+      "--revision",
+      "src/v8@20123",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": \"20123\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/buildtools\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
@@ skipping 18 matching lines @@
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
       "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
       "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#43426}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
-      "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
     ]
   },
   {
     "cmd": [],
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "ensure_goma"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
       "--platform",
       "linux-amd64",
       "--dest-directory",
       "[SLAVE_BUILD]/cipd",
       "--json-output",
       "/path/to/tmp/json"
     ],
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "ensure_goma.install cipd",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/cipd/cipd",
       "ensure",
       "--root",
       "[CACHE]/cipd/goma",
       "--list",
       "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
       "--json-output",
       "/path/to/tmp/json",
       "--service-account-json",
       "/creds/service_accounts/service-account-goma-client.json"
     ],
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "ensure_goma.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_layout/src/tools/swarming_client/swarming.py",
-      "--version"
-    ],
-    "name": "swarming.py --version",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@0.8.6@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout/src",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
+      "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "gclient runhooks (with patch)"
+    "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_layout/src/testing/scripts/get_compile_targets.py",
-      "--output",
-      "/path/to/tmp/json",
-      "--",
-      "--build-config-fs",
-      "Release",
-      "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]/linux_layout/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
-      "--properties",
-      "{\"buildername\": \"linux_precise_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
-    ],
-    "name": "get compile targets for scripts",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/linux_layout/src/testing/buildbot/chromium.webkit.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read test spec (chromium.webkit.json)",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_layout/src/testing/buildbot/chromium.webkit.json@@@",
-      "@@@STEP_LOG_LINE@json.output@{}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "--cached",
-      "--name-only"
-    ],
-    "cwd": "[BUILDER_CACHE]/linux_layout/src",
-    "name": "git diff to analyze patch",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@files@foo.cc@@@",
-      "@@@STEP_LOG_END@files@@@",
-      "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]/linux_layout/src/testing/buildbot/trybot_analyze_config.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read filter exclusion spec",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"exclusions\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"f.*\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"chromium\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"exclusions\": []@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import sys; sys.exit(0)"
-    ],
-    "name": "analyze",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@Analyze disabled: matched exclusion@@@",
-      "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
-      "@@@STEP_LOG_END@excluded_files@@@",
-      "@@@STEP_LOG_LINE@analyze_details@{@@@",
-      "@@@STEP_LOG_LINE@analyze_details@  \"additional_compile_targets\": [], @@@",
-      "@@@STEP_LOG_LINE@analyze_details@  \"compile_targets\": [@@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"blink_tests\"@@@",
-      "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
-      "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.compile_targets\": [@@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"blink_tests\"@@@",
-      "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
-      "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.test_targets\": [@@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"blink_tests\"@@@",
-      "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
-      "@@@STEP_LOG_LINE@analyze_details@  \"test_targets\": [@@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"blink_tests\"@@@",
-      "@@@STEP_LOG_LINE@analyze_details@  ]@@@",
-      "@@@STEP_LOG_LINE@analyze_details@}@@@",
-      "@@@STEP_LOG_END@analyze_details@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "python",
-      "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
-    ],
-    "name": "cleanup_temp"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb.py",
       "gen",
       "-m",
-      "tryserver.blink",
+      "client.v8.fyi",
       "-b",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--config-file",
-      "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "//out/Release"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout/src",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
       "--gsutil-py-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
       "Release",
       "--src-dir",
-      "[BUILDER_CACHE]/linux_layout/src",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--buildbot-mastername",
-      "tryserver.blink",
+      "client.v8.fyi",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "linux_precise_blink_rel.gomadeps",
+      "V8_Blink_Linux_64.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
       "[CACHE]/cipd/goma",
-      "--goma-fail-fast",
-      "--goma-disable-local-fallback",
-      "--ninja-ensure-up-to-date",
       "--",
       "blink_tests"
     ],
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "compile (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "import sys; sys.exit(0)"
+      "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
+      "--target",
+      "Release",
+      "--xvfb",
+      "--factory-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--build-properties",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "--step-name=webkit_unit_tests",
+      "--builder-name=V8-Blink Linux 64",
+      "--slave-name=TestSlavename",
+      "--build-number=571",
+      "webkit_unit_tests"
     ],
-    "name": "mark: before_tests"
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
+    "name": "webkit_unit_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--no-xvfb",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_precise_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_precise_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--step-name=webkit_tests (with patch)",
-      "--builder-name=linux_precise_blink_rel",
+      "--builder-name=V8-Blink Linux 64",
       "--slave-name=TestSlavename",
       "--build-number=571",
       "--run-python-script",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/layout_test_wrapper.py",
       "--target",
       "Release",
       "-o",
       "[SLAVE_BUILD]/layout-test-results",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_layout/src/out",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out",
       "--json-test-results",
       "/path/to/tmp/json",
       "--test-results-server",
       "test-results.appspot.com",
       "--build-number",
       "571",
       "--builder-name",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--step-name",
-      "webkit_tests (with patch)"
+      "webkit_tests (with patch)",
+      "--no-pixel-tests",
+      "--additional-expectations",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/v8/tools/blink_tests/TestExpectations"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "webkit_tests (with patch)",
     "~followup_annotations": [
       "step returned non-zero exit code: 101",
       "@@@STEP_TEXT@<br/>unexpected_flakes:<br/>flake/slow.html<br/>flake/totally-flakey.html<br/>flake/timeout-then-crash.html<br/><br/>unexpected_failures:<br/>bad/failing78.html<br/>bad/failing46.html<br/>bad/failing101.html<br/>bad/failing37.html<br/>bad/failing70.html<br/>bad/failing17.html<br/>bad/failing82.html<br/>bad/failing120.html<br/>bad/failing73.html<br/>bad/failing112.html<br/>bad/failing114.html<br/>bad/failing99.html<br/>bad/failing27.html<br/>bad/failing108.html<br/>bad/failing76.html<br/>bad/failing50.html<br/>bad/failing23.html<br/>bad/failing104.html<br/>bad/failing93.html<br/>bad/failing67.html<br/>bad/failing124.html<br/>bad/failing53.html<br/>bad/failing69.html<br/>bad/failing117.html<br/>bad/failing34.html<br/>bad/failing51.html<br/>bad/failing80.html<br/>bad/failing20.html<br/>bad/failing107.html<br/>bad/failing56.html<br/>bad/failing68.html<br/>bad/failing71.html<br/>bad/failing77.html<br/>bad/failing39.html<br/>bad/failing92.html<br/>bad/failing90.html<br/>bad/failing89.html<br/>bad/failing122.html<br/>bad/failing105.html<br/>tricky/totally-maybe-not-awesome.html<br/>bad/failing36.html<br/>bad/failing44.html<br/>bad/failing21.html<br/>bad/failing85.html<br/>bad/failing42.html<br/>bad/failing55.html<br/>bad/failing9.html<br/>bad/failing15.html<br/>bad/failing65.html<br/>bad/failing118.html<br/>bad/failing95.html<br/>bad/failing45.html<br/>bad/failing66.html<br/>bad/failing26.html<br/>bad/failing35.html<br/>bad/failing74.html<br/>bad/failing109.html<br/>bad/failing97.html<br/>bad/failing58.html<br/>bad/totally-bad-probably.html<br/>bad/failing11.html<br/>bad/failing111.html<br/>bad/failing86.html<br/>bad/failing30.html<br/>bad/failing54.html<br/>bad/failing38.html<br/>bad/failing13.html<br/>bad/failing63.html<br/>bad/failing116.html<br/>bad/failing41.html<br/>bad/failing18.html<br/>bad/failing84.html<br/>bad/failing2.html<br/>bad/failing28.html<br/>bad/failing33.html<br/>bad/failing106.html<br/>bad/failing48.html<br/>bad/failing0.html<br/>bad/failing4.html<br/>bad/failing64.html<br/>bad/failing47.html<br/>bad/failing121.html<br/>bad/failing25.html<br/>bad/failing8.html<br/>bad/failing100.html<br/>bad/failing102.html<br/>bad/failing123.html<br/>bad/failing88.html<br/>bad/failing61.html<br/>bad/failing79.html<br/>bad/failing43.html<br/>bad/failing57.html<br/>bad/failing16.html<br/>bad/failing96.html<br/>bad/failing94.html<br/>bad/failing119.html<br/>bad/failing113.html<br/>bad/failing72.html<br/>bad/failing1.html<br/>bad/failing103.html<br/>bad/failing110.html<br/>bad/failing32.html<br/>bad/failing12.html<br/>bad/failing10.html<br/>bad/failing40.html<br/>bad/failing5.html<br/>bad/failing75.html<br/>bad/failing98.html<br/>bad/failing115.html<br/>bad/failing49.html<br/>bad/failing6.html<br/>bad/failing19.html<br/>bad/failing87.html<br/>bad/failing59.html<br/>bad/failing22.html<br/>bad/failing24.html<br/>bad/failing3.html<br/>bad/failing91.html<br/>bad/failing60.html<br/>bad/failing81.html<br/>bad/failing83.html<br/>bad/failing62.html<br/>bad/failing52.html<br/>bad/failing29.html<br/>bad/failing31.html<br/>bad/failing7.html<br/>bad/failing14.html<br/><br/>Total executed: 9001<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_results.py",
       "--results-dir",
       "[SLAVE_BUILD]/layout-test-results",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_layout/src/out",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out",
       "--build-number",
       "571",
       "--builder-name",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--gs-bucket",
       "gs://chromium-layout-test-archives",
       "--staging-dir",
       "[CACHE]/chrome_staging"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "archive_webkit_tests_results",
     "~followup_annotations": [
-      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/linux_precise_blink_rel/571/layout-test-results/results.html@@@",
-      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/linux_precise_blink_rel/571/layout-test-results.zip@@@"
+      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Linux_64/571/layout-test-results/results.html@@@",
+      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Linux_64/571/layout-test-results.zip@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--patch_root",
       "src",
       "--revision_mapping_file",
-      "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+      "{\"src\": \"got_cr_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}",
       "--git-cache-dir",
       "[GIT_CACHE]",
-      "--rietveld_server",
-      "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "bot_update (without patch)",
+    "name": "bot_update (2)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
@@ skipping 24 matching lines @@
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
-      "runhooks"
-    ],
-    "cwd": "[BUILDER_CACHE]/linux_layout/src",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_CHROMIUM_NO_ACTION": "1",
-      "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
-    },
-    "name": "gclient runhooks (without patch)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb.py",
       "gen",
       "-m",
-      "tryserver.blink",
+      "client.v8.fyi",
       "-b",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--config-file",
-      "[BUILDER_CACHE]/linux_layout/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "//out/Release"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout/src",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files (without patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
       "--gsutil-py-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
       "Release",
       "--src-dir",
-      "[BUILDER_CACHE]/linux_layout/src",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--buildbot-mastername",
-      "tryserver.blink",
+      "client.v8.fyi",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "linux_precise_blink_rel.gomadeps",
+      "V8_Blink_Linux_64.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
       "[CACHE]/cipd/goma",
-      "--goma-fail-fast",
-      "--goma-disable-local-fallback",
-      "--ninja-ensure-up-to-date",
       "--",
       "blink_tests"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "compile (without patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--no-xvfb",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_precise_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_precise_blink_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patch_project\": \"chromium\", \"patchset\": 1, \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--step-name=webkit_tests (without patch)",
-      "--builder-name=linux_precise_blink_rel",
+      "--builder-name=V8-Blink Linux 64",
       "--slave-name=TestSlavename",
       "--build-number=571",
       "--run-python-script",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/layout_test_wrapper.py",
       "--target",
       "Release",
       "-o",
       "[SLAVE_BUILD]/layout-test-results",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_layout/src/out",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out",
       "--json-test-results",
       "/path/to/tmp/json",
       "--test-results-server",
       "test-results.appspot.com",
       "--build-number",
       "571",
       "--builder-name",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--step-name",
       "webkit_tests (without patch)",
+      "--no-pixel-tests",
+      "--additional-expectations",
+      "[BUILDER_CACHE]/V8_Blink_Linux_64/src/v8/tools/blink_tests/TestExpectations",
       "--test-list",
       "bad/failing78.html\nbad/failing46.html\nbad/failing101.html\nbad/failing37.html\nbad/failing70.html\nbad/failing17.html\nbad/failing82.html\nbad/failing120.html\nbad/failing73.html\nbad/failing112.html\nbad/failing114.html\nbad/failing99.html\nbad/failing27.html\nbad/failing108.html\nbad/failing76.html\nbad/failing50.html\nbad/failing23.html\nbad/failing104.html\nbad/failing93.html\nbad/failing67.html\nbad/failing124.html\nbad/failing53.html\nbad/failing69.html\nbad/failing117.html\nbad/failing34.html\nbad/failing51.html\nbad/failing80.html\nbad/failing20.html\nbad/failing107.html\nbad/failing56.html\nbad/failing68.html\nbad/failing71.html\nbad/failing77.html\nbad/failing39.html\nbad/failing92.html\nbad/failing90.html\nbad/failing89.html\nbad/failing122.html\nbad/failing105.html\ntricky/totally-maybe-not-awesome.html\nbad/failing36.html\nbad/failing44.html\nbad/failing21.html\nbad/failing85.html\nbad/failing42.html\nbad/failing55.html\nbad/failing9.html\nbad/failing15.html\nbad/failing65.html\nbad/failing118.html\nbad/failing95.html\nbad/failing45.html\nbad/failing66.html\nbad/failing26.html\nbad/failing35.html\nbad/failing74.html\nbad/failing109.html\nbad/failing97.html\nbad/failing58.html\nbad/totally-bad-probably.html\nbad/failing11.html\nbad/failing111.html\nbad/failing86.html\nbad/failing30.html\nbad/failing54.html\nbad/failing38.html\nbad/failing13.html\nbad/failing63.html\nbad/failing116.html\nbad/failing41.html\nbad/failing18.html\nbad/failing84.html\nbad/failing2.html\nbad/failing28.html\nbad/failing33.html\nbad/failing106.html\nbad/failing48.html\nbad/failing0.html\nbad/failing4.html\nbad/failing64.html\nbad/failing47.html\nbad/failing121.html\nbad/failing25.html\nbad/failing8.html\nbad/failing100.html\nbad/failing102.html\nbad/failing123.html\nbad/failing88.html\nbad/failing61.html\nbad/failing79.html\nbad/failing43.html\nbad/failing57.html\nbad/failing16.html\nbad/failing96.html\nbad/failing94.html\nbad/failing119.html\nbad/failing113.html\nbad/failing72.html\nbad/failing1.html\nbad/failing103.html\nbad/failing110.html\nbad/failing32.html\nbad/failing12.html\nbad/failing10.html\nbad/failing40.html\nbad/failing5.html\nbad/failing75.html\nbad/failing98.html\nbad/failing115.html\nbad/failing49.html\nbad/failing6.html\nbad/failing19.html\nbad/failing87.html\nbad/failing59.html\nbad/failing22.html\nbad/failing24.html\nbad/failing3.html\nbad/failing91.html\nbad/failing60.html\nbad/failing81.html\nbad/failing83.html\nbad/failing62.html\nbad/failing52.html\nbad/failing29.html\nbad/failing31.html\nbad/failing7.html\nbad/failing14.html",
       "--skipped",
       "always"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "webkit_tests (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
     "name": "webkit_tests (retry summary)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>bad/failing78.html<br/>bad/failing46.html<br/>bad/failing101.html<br/>bad/totally-bad-probably.html<br/>bad/failing70.html<br/>bad/failing17.html<br/>bad/failing82.html<br/>bad/failing120.html<br/>bad/failing73.html<br/>bad/failing112.html<br/>bad/failing114.html<br/>bad/failing99.html<br/>bad/failing121.html<br/>bad/failing108.html<br/>bad/failing76.html<br/>bad/failing50.html<br/>bad/failing23.html<br/>bad/failing104.html<br/>bad/failing93.html<br/>bad/failing67.html<br/>bad/failing124.html<br/>bad/failing53.html<br/>bad/failing69.html<br/>bad/failing117.html<br/>bad/failing34.html<br/>bad/failing51.html<br/>bad/failing80.html<br/>bad/failing20.html<br/>bad/failing107.html<br/>bad/failing56.html<br/>bad/failing68.html<br/>bad/failing71.html<br/>bad/failing77.html<br/>bad/failing39.html<br/>bad/failing92.html<br/>bad/failing90.html<br/>bad/failing89.html<br/>bad/failing122.html<br/>bad/failing105.html<br/>tricky/totally-maybe-not-awesome.html<br/>bad/failing36.html<br/>bad/failing44.html<br/>bad/failing21.html<br/>bad/failing85.html<br/>bad/failing42.html<br/>bad/failing55.html<br/>bad/failing9.html<br/>bad/failing15.html<br/>bad/failing65.html<br/>bad/failing118.html<br/>bad/failing95.html<br/>bad/failing45.html<br/>bad/failing66.html<br/>bad/failing26.html<br/>bad/failing35.html<br/>bad/failing74.html<br/>bad/failing109.html<br/>bad/failing97.html<br/>bad/failing58.html<br/>bad/failing37.html<br/>bad/failing11.html<br/>bad/failing111.html<br/>bad/failing86.html<br/>bad/failing30.html<br/>bad/failing54.html<br/>bad/failing38.html<br/>bad/failing13.html<br/>bad/failing63.html<br/>bad/failing116.html<br/>bad/failing41.html<br/>bad/failing18.html<br/>bad/failing84.html<br/>bad/failing2.html<br/>bad/failing28.html<br/>bad/failing33.html<br/>bad/failing106.html<br/>bad/failing48.html<br/>bad/failing0.html<br/>bad/failing4.html<br/>bad/failing64.html<br/>bad/failing47.html<br/>bad/failing27.html<br/>bad/failing25.html<br/>bad/failing8.html<br/>bad/failing100.html<br/>bad/failing102.html<br/>bad/failing123.html<br/>bad/failing88.html<br/>bad/failing61.html<br/>bad/failing79.html<br/>bad/failing43.html<br/>bad/failing57.html<br/>bad/failing16.html<br/>bad/failing96.html<br/>bad/failing94.html<br/>bad/failing119.html<br/>bad/failing113.html<br/>bad/failing72.html<br/>bad/failing1.html<br/>bad/failing103.html<br/>bad/failing110.html<br/>bad/failing32.html<br/>bad/failing12.html<br/>bad/failing10.html<br/>bad/failing40.html<br/>bad/failing5.html<br/>bad/failing75.html<br/>bad/failing98.html<br/>bad/failing115.html<br/>bad/failing49.html<br/>bad/failing6.html<br/>bad/failing19.html<br/>bad/failing87.html<br/>bad/failing59.html<br/>bad/failing22.html<br/>bad/failing24.html<br/>bad/failing3.html<br/>bad/failing91.html<br/>bad/failing60.html<br/>bad/failing81.html<br/>bad/failing83.html<br/>bad/failing62.html<br/>bad/failing52.html<br/>bad/failing29.html<br/>bad/failing31.html<br/>bad/failing7.html<br/>bad/failing14.html<br/>@@@",
-      "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"TEST_FAILURE\"@@@"
+      "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_layout_test_retry_summary.py",
       "--retry-summary-json",
       "{\"failures\": [\"bad/failing0.html\", \"bad/failing1.html\", \"bad/failing10.html\", \"bad/failing100.html\", \"bad/failing101.html\", \"bad/failing102.html\", \"bad/failing103.html\", \"bad/failing104.html\", \"bad/failing105.html\", \"bad/failing106.html\", \"bad/failing107.html\", \"bad/failing108.html\", \"bad/failing109.html\", \"bad/failing11.html\", \"bad/failing110.html\", \"bad/failing111.html\", \"bad/failing112.html\", \"bad/failing113.html\", \"bad/failing114.html\", \"bad/failing115.html\", \"bad/failing116.html\", \"bad/failing117.html\", \"bad/failing118.html\", \"bad/failing119.html\", \"bad/failing12.html\", \"bad/failing120.html\", \"bad/failing121.html\", \"bad/failing122.html\", \"bad/failing123.html\", \"bad/failing124.html\", \"bad/failing13.html\", \"bad/failing14.html\", \"bad/failing15.html\", \"bad/failing16.html\", \"bad/failing17.html\", \"bad/failing18.html\", \"bad/failing19.html\", \"bad/failing2.html\", \"bad/failing20.html\", \"bad/failing21.html\", \"bad/failing22.html\", \"bad/failing23.html\", \"bad/failing24.html\", \"bad/failing25.html\", \"bad/failing26.html\", \"bad/failing27.html\", \"bad/failing28.html\", \"bad/failing29.html\", \"bad/failing3.html\", \"bad/failing30.html\", \"bad/failing31.html\", \"bad/failing32.html\", \"bad/failing33.html\", \"bad/failing34.html\", \"bad/failing35.html\", \"bad/failing36.html\", \"bad/failing37.html\", \"bad/failing38.html\", \"bad/failing39.html\", \"bad/failing4.html\", \"bad/failing40.html\", \"bad/failing41.html\", \"bad/failing42.html\", \"bad/failing43.html\", \"bad/failing44.html\", \"bad/failing45.html\", \"bad/failing46.html\", \"bad/failing47.html\", \"bad/failing48.html\", \"bad/failing49.html\", \"bad/failing5.html\", \"bad/failing50.html\", \"bad/failing51.html\", \"bad/failing52.html\", \"bad/failing53.html\", \"bad/failing54.html\", \"bad/failing55.html\", \"bad/failing56.html\", \"bad/failing57.html\", \"bad/failing58.html\", \"bad/failing59.html\", \"bad/failing6.html\", \"bad/failing60.html\", \"bad/failing61.html\", \"bad/failing62.html\", \"bad/failing63.html\", \"bad/failing64.html\", \"bad/failing65.html\", \"bad/failing66.html\", \"bad/failing67.html\", \"bad/failing68.html\", \"bad/failing69.html\", \"bad/failing7.html\", \"bad/failing70.html\", \"bad/failing71.html\", \"bad/failing72.html\", \"bad/failing73.html\", \"bad/failing74.html\", \"bad/failing75.html\", \"bad/failing76.html\", \"bad/failing77.html\", \"bad/failing78.html\", \"bad/failing79.html\", \"bad/failing8.html\", \"bad/failing80.html\", \"bad/failing81.html\", \"bad/failing82.html\", \"bad/failing83.html\", \"bad/failing84.html\", \"bad/failing85.html\", \"bad/failing86.html\", \"bad/failing87.html\", \"bad/failing88.html\", \"bad/failing89.html\", \"bad/failing9.html\", \"bad/failing90.html\", \"bad/failing91.html\", \"bad/failing92.html\", \"bad/failing93.html\", \"bad/failing94.html\", \"bad/failing95.html\", \"bad/failing96.html\", \"bad/failing97.html\", \"bad/failing98.html\", \"bad/failing99.html\", \"bad/totally-bad-probably.html\", \"tricky/totally-maybe-not-awesome.html\"], \"ignored\": []}",
       "--build-number",
       "571",
       "--builder-name",
-      "linux_precise_blink_rel",
+      "V8-Blink Linux 64",
       "--gs-bucket",
       "gs://chromium-layout-test-archives"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_layout",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
-    },
-    "name": "archive_retry_summary",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@failure_hash@\"8c01a91e897840b224972c26207016e752e15ac5\"@@@"
-    ]
+    "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64",
+    "name": "archive_retry_summary"
   },
   {
     "name": "$result",
     "reason": "1 out of 1 aggregated steps failed. Failures: Step('webkit_tests (retry summary)') failed with return_code 1",
     "recipe_result": null,
     "status_code": 1
   }
 ]