[recipes] Use named caches for git and workdirs

Bug: skia:
Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
Reviewed-on: https://skia-review.googlesource.com/123929
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

7 files changed, 43 insertions, 43 deletions

diff --git a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
index a2967213c3..cf2c43fcb2 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_/_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_/_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--patch_root",
       "skia",
       "--revision_mapping_file",
       "{\"got_revision\": \"skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_/_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--output_json",
@@ -49,7 +49,7 @@
       "--revision",
       "src@origin/lkcr"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
@@ -103,7 +103,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env": {
       "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1",
       "DEPOT_TOOLS_UPDATE": "0",
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json
index af1d2a63b8..4399b6cde2 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_/_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_/_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'parent_repo', 'url': 'https://skia.googlesource.com/parent_repo.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'parent_repo', 'url': 'https://skia.googlesource.com/parent_repo.git'}]",
       "--patch_root",
       "skia",
       "--revision_mapping_file",
       "{\"got_revision\": \"parent_repo\"}",
       "--git-cache-dir",
-      "[CUSTOM_/_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--gerrit_repo",
@@ -51,7 +51,7 @@
       "--revision",
       "parent_repo@abc123"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
index b41ff52e47..c73455d175 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_/_B_WORK]/flutter"
+      "[START_DIR]/cache/work/flutter"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_/_B_WORK]/flutter/.gclient_entries"
+      "[START_DIR]/cache/work/flutter/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/flutter/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/flutter', 'url': 'https://github.com/flutter/engine.git'}]\ntarget_os = ['android']",
       "--patch_root",
       "src/third_party/skia",
       "--revision_mapping_file",
       "{\"got_flutter_revision\": \"src/flutter\", \"got_revision\": \"src/third_party/skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_/_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--gerrit_repo",
@@ -53,7 +53,7 @@
       "--revision",
       "src/third_party/skia@abc123"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]/flutter",
+    "cwd": "[START_DIR]/cache/work/flutter",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json
index 162d5d2f2b..ffce3b2ee9 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_C:\\_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_C:\\_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
       "--patch_root",
       "skia",
       "--revision_mapping_file",
       "{\"got_revision\": \"skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_C:\\_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--output_json",
@@ -47,7 +47,7 @@
       "--revision",
       "skia@abc123^"
     ],
-    "cwd": "[CUSTOM_C:\\_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json
index 8be1f734d4..2a1eb4cb64 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/parent_revision_trybot.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_C:\\_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_C:\\_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
       "--patch_root",
       "skia",
       "--revision_mapping_file",
       "{\"got_revision\": \"skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_C:\\_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--output_json",
@@ -47,7 +47,7 @@
       "--revision",
       "skia@abc123"
     ],
-    "cwd": "[CUSTOM_C:\\_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json
index 03aed27295..fe3983f59c 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_/_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_/_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'pdfium', 'url': 'https://pdfium.googlesource.com/pdfium.git'}]",
       "--patch_root",
       "pdfium/third_party/skia",
       "--revision_mapping_file",
       "{\"got_pdfium_revision\": \"pdfium\", \"got_revision\": \"pdfium/third_party/skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_/_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--gerrit_repo",
@@ -53,7 +53,7 @@
       "--revision",
       "pdfium/third_party/skia@abc123"
     ],
-    "cwd": "[CUSTOM_/_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"
diff --git a/infra/bots/recipe_modules/core/examples/full.expected/test.json b/infra/bots/recipe_modules/core/examples/full.expected/test.json
index 82df2360ab..ef0d4965bc 100644
--- a/infra/bots/recipe_modules/core/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/test.json
@@ -9,7 +9,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_C:\\_B_WORK]"
+      "[START_DIR]/cache/work"
     ],
     "infra_step": true,
     "name": "makedirs checkout_path"
@@ -22,10 +22,10 @@
       "--json-output",
       "/path/to/tmp/json",
       "remove",
-      "[CUSTOM_C:\\_B_WORK]/.gclient_entries"
+      "[START_DIR]/cache/work/.gclient_entries"
     ],
     "infra_step": true,
-    "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries"
+    "name": "remove [START_DIR]/cache/work/.gclient_entries"
   },
   {
     "cmd": [
@@ -33,13 +33,13 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
-      "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+      "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
       "--patch_root",
       "skia",
       "--revision_mapping_file",
       "{\"got_revision\": \"skia\"}",
       "--git-cache-dir",
-      "[CUSTOM_C:\\_B_CACHE]",
+      "[START_DIR]/cache/git",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
       "--gerrit_repo",
@@ -51,7 +51,7 @@
       "--revision",
       "skia@abc123"
     ],
-    "cwd": "[CUSTOM_C:\\_B_WORK]",
+    "cwd": "[START_DIR]/cache/work",
     "env_prefixes": {
       "PATH": [
         "RECIPE_PACKAGE_REPO[depot_tools]"