Revert of fix swarmbucket infra path (patchset #3 id:40001 of...

Revert of fix swarmbucket infra path (patchset #3 id:40001 of https://codereview.chromium.org/2477033002/ )

Reason for revert:
Broke build CQ: https://luci-milo.appspot.com/swarming/task/324a5636a5cfdf10/steps/Uncaught_Exception/0/logs/exception/0

Original issue's description:
> fix swarmbucket infra path
>
> Do not rely on buildbot config which goes up 4 directories. Everything
> should happen in the workdir. Also exclude any project-specific paths.
>
> This fixes the problem that swarmbucket builds expect git_cache to be in
> /b/git_cache. It should be in the CWD/git_cache. This will fix Windows
> builders.
>
> R=vadimsh@chromium.org
> BUG=
>
> Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/b8b5aaea9217f0a2e0b9a48bfa6e6fc054d74d23

TBR=vadimsh@chromium.org,nodir@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review-Url: https://codereview.chromium.org/2484433002

recipe_modules/infra_paths/example.expected/basic.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_buildbot_linux.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_buildbot_mac.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_buildbot_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_kitchen_linux.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_kitchen_mac.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_kitchen_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json

@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show cache path",
     "~followup_annotations": [
-      "@@@STEP_TEXT@[GIT_CACHE]@@@"
+      "@@@STEP_TEXT@[CACHE]@@@"
     ]
   },
   {

recipe_modules/infra_paths/example.py

@@ -13,7 +13,7 @@ DEPS = [
 
 def RunSteps(api):
   api.step('show cache path', [])
-  api.step.active_result.presentation.step_text = str(api.path['git_cache'])
+  api.step.active_result.presentation.step_text = str(api.path['cache'])
 
 
 def GenTests(api):

recipe_modules/infra_paths/path_config.py

@@ -53,8 +53,6 @@ def infra_kitchen(c):
       c.base_paths[path] = c.base_paths['cache'] + (path,)
 
 
-@CONFIG_CTX()
+@CONFIG_CTX(includes=['infra_buildbot'])
 def infra_swarmbucket(c):
-  c.base_paths['root'] = c.CURRENT_WORKING_DIR
   c.base_paths['git_cache'] = c.base_paths['root'] + ('git_cache',)
-  c.base_paths['goma_cache'] = c.base_paths['root'] + ('goma_cache',)