Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json
diff --git a/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json b/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json
index 64fb7e62614738f97f77d0782eb14cb201c7a091..56a79fe2cef6fcad43741259e53d8ff351c0003e 100644
--- a/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json
+++ b/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_chromium_builder.json
@@ -11,13 +11,13 @@
"--slave",
"test",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
"--root",
"chromite",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,6 +25,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -49,7 +50,7 @@
{
"allow_subannotations": true,
"cmd": [
- "[CWD]/chromite/bin/cbuildbot",
+ "[SLAVE_BUILD]/chromite/bin/cbuildbot",
"--buildroot",
"[ROOT]/cbuild/shared_external",
"--buildbot",
@@ -61,7 +62,7 @@
"b8819267417da248aa4fe829c5fcf0965e17b0c3",
"x86-generic-tot-chrome-pfq-informational"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "cbuildbot [x86-generic-tot-chrome-pfq-informational]"
},
{

Powered by Google App Engine
This is Rietveld 408576698