Revert of tryserver.chromium.win: convert chromium_trybot builders to remote_run (patchset #2 id:20…

scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_chromium_trybot.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
     "name": "taskkill"
   },
   {
     "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]\\win",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng",
       "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 29 matching lines @@
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--revision",
       "src/third_party/skia@HEAD",
       "--output_manifest"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "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 118 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]\\win\\src\\tools\\swarming_client\\swarming.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\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]\\win\\src",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng\\src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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=ia32 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]\\win\\src\\testing\\scripts\\get_compile_targets.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\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]\\\\win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
       "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
     ],
     "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]\\win\\src\\testing\\buildbot\\chromium.gpu.json",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.gpu.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.gpu.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.gpu.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_chromium_rel_ng\\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]\\win\\src\\testing\\buildbot\\chromium.win.json",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.win.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.win.json)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json@@@",
+      "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.win.json@@@",
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[depot_tools]\\bootstrap\\win\\win_tools.bat"
     ],
     "cwd": "RECIPE_PACKAGE_REPO[depot_tools]",
     "name": "ensure git tooling on windows"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[depot_tools]\\git.bat",
       "diff",
       "--cached",
       "--name-only"
     ],
-    "cwd": "[BUILDER_CACHE]\\win\\src\\third_party\\skia",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\third_party\\skia",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@files@third_party/skia/foo.cc@@@",
       "@@@STEP_LOG_END@files@@@",
       "@@@SET_BUILD_PROPERTY@subproject_tag@\"blink-paths\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\trybot_analyze_config.json",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\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@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"chromium\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"exclusions\": []@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"ios\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"exclusions\": []@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb.py",
       "analyze",
       "-m",
       "tryserver.chromium.win",
       "-b",
       "win_chromium_rel_ng",
       "-v",
       "//out/Release",
       "{\"additional_compile_targets\": [\"chromium_builder_tests\"], \"files\": [\"third_party/skia/foo.cc\"], \"test_targets\": [\"blink_heap_unittests\", \"blink_platform_unittests\", \"mini_installer\", \"webkit_unit_tests\", \"wtf_unittests\"]}",
       "/path/to/tmp/json"
     ],
@@ skipping 35 matching lines @@
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
     ],
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb.py",
       "gen",
       "-m",
       "tryserver.chromium.win",
       "-b",
       "win_chromium_rel_ng",
       "--config-file",
-      "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb_config.pyl",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb_config.pyl",
       "--goma-dir",
       "[CACHE]\\cipd\\goma",
       "//out/Release"
     ],
-    "cwd": "[BUILDER_CACHE]\\win\\src",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng\\src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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.exe",
       "--target",
       "Release",
       "--src-dir",
-      "[BUILDER_CACHE]\\win\\src",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\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",
       "C:\\creds\\service_accounts\\service-account-goma-client.json",
@@ skipping 19 matching lines @@
       "python",
       "-u",
       "import sys; sys.exit(0)"
     ],
     "name": "mark: before_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\webkit_lint.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\scripts\\webkit_lint.py",
       "--build-config-fs",
       "Release",
       "--use-src-side-runtest-py",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]\\\\win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
       "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
       "run",
       "--output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "webkit_lint (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"failures\": [], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"valid\": true@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\webkit_python_tests.py",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\scripts\\webkit_python_tests.py",
       "--build-config-fs",
       "Release",
       "--use-src-side-runtest-py",
       "--paths",
-      "{\"checkout\": \"[BUILDER_CACHE]\\\\win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+      "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
       "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
       "run",
       "--output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "webkit_python_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"failures\": [], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"valid\": true@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[BUILDER_CACHE]\\win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
       "--target",
       "Release",
       "--results-directory",
       "[SLAVE_BUILD]\\layout-test-results",
       "--build-dir",
-      "[BUILDER_CACHE]\\win\\src\\out",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\out",
       "--json-test-results",
       "/path/to/tmp/json",
       "--test-results-server",
       "test-results.appspot.com",
       "--build-number",
       "571",
       "--builder-name",
       "win_chromium_rel_ng",
       "--step-name",
       "webkit_tests (with patch)",
       "--master-name",
       "tryserver.chromium.win",
       "--debug-rwt-logging"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "webkit_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
     ]
   },
   {
     "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]\\win\\src\\out",
+      "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\out",
       "--build-number",
       "571",
       "--builder-name",
       "win_chromium_rel_ng",
       "--gs-bucket",
       "gs://chromium-layout-test-archives",
       "--staging-dir",
       "[CACHE]\\chrome_staging"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "archive_webkit_tests_results",
     "~followup_annotations": [
       "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win_chromium_rel_ng/571/layout-test-results/results.html@@@",
       "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win_chromium_rel_ng/571/layout-test-results.zip@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
       "--target",
       "Release"
     ],
-    "cwd": "[BUILDER_CACHE]\\win",
+    "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "process_dumps"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]