build: roll infra_paths changes

scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json

Index: scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json
diff --git a/scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json b/scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json
index d6bb9886cc314f92a89dd06aa5a91ecfa49bf095..2cf50c248a663259992bed5a962ff40ec289c9bf 100644
--- a/scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json
+++ b/scripts/slave/recipes/infra/infra_continuous.expected/infra-64.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
       "--root",
       "infra",
       "--revision_mapping_file",
       "{\"infra\": \"got_revision\"}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]/b/build/slave/cache_dir",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,7 +25,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -64,7 +63,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -77,65 +75,61 @@
       "test.py",
       "test"
     ],
-    "cwd": "[SLAVE_BUILD]/infra",
+    "cwd": "[CWD]/infra",
     "name": "infra python tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/glyco/tests/run_all_tests.py"
+      "[CWD]/infra/glyco/tests/run_all_tests.py"
     ],
-    "cwd": "[SLAVE_BUILD]/infra",
+    "cwd": "[CWD]/infra",
     "name": "Glyco tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/go/env.py",
+      "[CWD]/infra/go/env.py",
       "go",
       "version"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "go third parties"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/go/env.py",
+      "[CWD]/infra/go/env.py",
       "python",
-      "[SLAVE_BUILD]/infra/go/test.py"
+      "[CWD]/infra/go/test.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "infra go tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/build/build.py",
+      "[CWD]/infra/build/build.py",
       "--builder",
       "infra-continuous-64"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cipd - build packages"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/build/test_packages.py"
+      "[CWD]/infra/build/test_packages.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cipd - test packages integrity"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/build/build.py",
+      "[CWD]/infra/build/build.py",
       "--no-rebuild",
       "--upload",
       "--service-account-json",
@@ -149,7 +143,6 @@
       "git_repository:https://chromium.googlesource.com/infra/infra",
       "git_revision:5e03a58dc0850e5137a8ebbce29610670c756aed"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cipd - upload packages",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
@@ -161,9 +154,8 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\npath = sys.argv[1]\nif os.path.exists(path):\n  for p in (os.path.join(path, x) for x in os.listdir(path)):\n    if os.path.isdir(p):\n      chromium_utils.RemoveDirectory(p)\n    else:\n      os.unlink(p)\n",
-      "[SLAVE_BUILD]/infra/go/bin"
+      "[CWD]/infra/go/bin"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rmcontents clean go bin",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -184,12 +176,11 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/infra/go/env.py",
+      "[CWD]/infra/go/env.py",
       "go",
       "install",
       "github.com/luci/luci-go/client/cmd/..."
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "build luci-go"
   },
   {
@@ -197,10 +188,9 @@
       "python",
       "-u",
       "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n  with open(sys.argv[2], 'w') as f:\n    json.dump(os.listdir(sys.argv[1]), f)\n",
-      "[SLAVE_BUILD]/infra/go/bin",
+      "[CWD]/infra/go/bin",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "listdir listing go bin",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -220,13 +210,12 @@
     "cmd": [
       "python",
       "-u",
-      "[DEPOT_TOOLS]/upload_to_google_storage.py",
+      "[ROOT]/b/depot_tools/upload_to_google_storage.py",
       "-b",
       "chromium-luci",
-      "[SLAVE_BUILD]/infra/go/bin/file 1",
-      "[SLAVE_BUILD]/infra/go/bin/file 2"
+      "[CWD]/infra/go/bin/file 1",
+      "[CWD]/infra/go/bin/file 2"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "upload go bin"
   },
   {
@@ -234,10 +223,9 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/infra/go/bin/file 1.sha1",
+      "[CWD]/infra/go/bin/file 1.sha1",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "file 1 sha1",
     "~followup_annotations": [
       "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"
@@ -248,10 +236,9 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/infra/go/bin/file 2.sha1",
+      "[CWD]/infra/go/bin/file 2.sha1",
       "/path/to/tmp/"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "file 2 sha1",
     "~followup_annotations": [
       "@@@STEP_TEXT@0123456789abcdeffedcba987654321012345678@@@"