tryserver.chromium.linux: convert chromium_trybot builders to remote_run

scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.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_chromium_rel_ng",
+      "[BUILDER_CACHE]/linux",
       "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):@@@",
@@ skipping 27 matching lines @@
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "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\"@@@",
@@ skipping 117 matching lines @@
       "@@@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_chromium_rel_ng/src/tools/swarming_client/swarming.py",
+      "[BUILDER_CACHE]/linux/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_chromium_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/linux/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/scripts/get_compile_targets.py",
+      "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
       "--output",
       "/path/to/tmp/json",
       "--",
       "--build-config-fs",
       "Release",
       "--use-src-side-runtest-py",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]/linux_chromium_rel_ng/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
       "--properties",
       "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"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_chromium_rel_ng/src/testing/buildbot/chromium.gpu.json",
+      "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.gpu.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.gpu.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json@@@",
       "@@@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_chromium_rel_ng/src/testing/buildbot/chromium.linux.json",
+      "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.linux.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.linux.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"Linux Tests\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
       "@@@STEP_LOG_LINE@json.output@          \"can_use_on_swarming_builders\": true@@@",
       "@@@STEP_LOG_LINE@json.output@        }, @@@",
       "@@@STEP_LOG_LINE@json.output@        \"test\": \"gl_tests\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "git",
       "diff",
       "--cached",
       "--name-only"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/linux/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_chromium_rel_ng/src/testing/buildbot/trybot_analyze_config.json",
+      "[BUILDER_CACHE]/linux/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@    ]@@@",
@@ skipping 52 matching lines @@
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release",
+      "[BUILDER_CACHE]/linux/src/out/Release",
       "--clean-isolated-files"
     ],
     "name": "clean isolated files"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
       "gen",
       "-m",
       "tryserver.chromium.linux",
       "-b",
       "linux_chromium_rel_ng",
       "--config-file",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--swarming-targets-file",
       "gl_tests\n",
       "//out/Release"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/linux/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
       "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
     ]
   },
   {
     "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_chromium_rel_ng/src",
+      "[BUILDER_CACHE]/linux/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--goma-deps-cache-dir",
       "[GOMA_DEPS_CACHE]",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
@@ skipping 15 matching lines @@
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release",
+      "[BUILDER_CACHE]/linux/src/out/Release",
       "--src-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src"
+      "[BUILDER_CACHE]/linux/src"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "remove_build_metadata"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--verbose",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release/gl_tests.isolated.gen.json"
+      "[BUILDER_CACHE]/linux/src/out/Release/gl_tests.isolated.gen.json"
     ],
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_tests\": \"[dummy hash for gl_tests]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "name": "mark: before_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client/swarming.py",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "30",
       "--shards",
       "1",
       "--task-name",
@@ skipping 44 matching lines @@
       "slavename:TestSlavename",
       "--tag",
       "stepname:gl_tests (with patch) on Ubuntu-12.04",
       "--idempotent",
       "--user",
       "commit-bot@chromium.org",
       "[dummy hash for gl_tests]",
       "--",
       "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "[trigger] gl_tests (with patch) on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@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@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
       "python",
       "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
       "--swarming-client-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client",
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--json",
       "{\"base_task_name\": \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", \"tasks\": {\"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "gl_tests (with patch) on Ubuntu-12.04",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
@@ skipping 10 matching lines @@
       "linux_chromium_rel_ng",
       "--build-number",
       "571",
       "--test-type",
       "gl_tests (with patch) on Ubuntu-12.04",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "170242"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "Upload to test-results [gl_tests (with patch) on Ubuntu-12.04]"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
@@ skipping 13 matching lines @@
       "[GIT_CACHE]",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "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)",
     "~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\": {@@@",
@@ skipping 53 matching lines @@
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/linux/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 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",
       "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
       "--build-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release",
+      "[BUILDER_CACHE]/linux/src/out/Release",
       "--clean-isolated-files"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "clean isolated files (2)"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb.py",
+      "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
       "gen",
       "-m",
       "tryserver.chromium.linux",
       "-b",
       "linux_chromium_rel_ng",
       "--config-file",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb_config.pyl",
+      "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--swarming-targets-file",
       "gl_tests\n",
       "//out/Release"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
+    "cwd": "[BUILDER_CACHE]/linux/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files (without patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
       "@@@STEP_LOG_END@swarming-targets-file.txt@@@"
     ]
   },
   {
     "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_chromium_rel_ng/src",
+      "[BUILDER_CACHE]/linux/src",
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--goma-deps-cache-dir",
       "[GOMA_DEPS_CACHE]",
       "--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",
       "--",
       "gl_tests",
       "gl_tests_run"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "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",
       "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n  f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
       "/path/to/tmp/",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release/*.isolated.gen.json"
+      "[BUILDER_CACHE]/linux/src/out/Release/*.isolated.gen.json"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "find isolated targets"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--verbose",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release/dummy_target_1.isolated.gen.json",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release/dummy_target_2.isolated.gen.json"
+      "[BUILDER_CACHE]/linux/src/out/Release/dummy_target_1.isolated.gen.json",
+      "[BUILDER_CACHE]/linux/src/out/Release/dummy_target_2.isolated.gen.json"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "isolate tests (2)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client/swarming.py",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "30",
       "--shards",
       "1",
       "--task-name",
@@ skipping 45 matching lines @@
       "--tag",
       "stepname:gl_tests (without patch) on Ubuntu-12.04",
       "--idempotent",
       "--user",
       "commit-bot@chromium.org",
       "[dummy hash for gl_tests]",
       "--",
       "--gtest_filter=Test.Two",
       "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "[trigger] gl_tests (without patch) on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@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@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
       "python",
       "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
       "--swarming-client-dir",
-      "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
+      "[BUILDER_CACHE]/linux/src/tools/swarming_client",
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--json",
       "{\"base_task_name\": \"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", \"tasks\": {\"gl_tests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "gl_tests (without patch) on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
       "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
       "--master-name",
       "tryserver.chromium.linux",
       "--builder-name",
       "linux_chromium_rel_ng",
       "--build-number",
       "571",
       "--test-type",
       "gl_tests (without patch) on Ubuntu-12.04",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "170242"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "Upload to test-results [gl_tests (without patch) on Ubuntu-12.04]"
   },
   {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(1)"
     ],
-    "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
+    "cwd": "[BUILDER_CACHE]/linux",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "gl_tests (retry summary)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
       "@@@STEP_FAILURE@@@",
       "@@@SET_BUILD_PROPERTY@failure_type@\"TEST_FAILURE\"@@@",
       "@@@SET_BUILD_PROPERTY@failure_hash@\"2c817ab2d4394c69c9b8a0698b954936d9e1fb76\"@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "1 out of 1 aggregated steps failed. Failures: Step('gl_tests (retry summary)') failed with return_code 1",
     "recipe_result": null,
     "status_code": 1
   }
 ]