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

Unified Diff: scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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_tryjob.expected/unknown_config.json
diff --git a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json
index 0072b5e566a047e8080ad5ea0483d84c2e59665f..3d47e1ef1643a33365a24a8bc2544628c71bc776 100644
--- a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json
+++ b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json
@@ -11,13 +11,13 @@
"--slave",
"test",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'chromite', 'url': 'https://chromium.googlesource.com/chromiumos/chromite.git'}]",
"--root",
"chromite",
"--revision_mapping_file",
"{}",
"--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]"
},
@@ -53,7 +52,7 @@
"checkout",
"master"
],
- "cwd": "[SLAVE_BUILD]/chromite",
+ "cwd": "[CWD]/chromite",
"name": "checkout chromite branch [master]"
},
{
@@ -61,7 +60,7 @@
"git",
"pull"
],
- "cwd": "[SLAVE_BUILD]/chromite",
+ "cwd": "[CWD]/chromite",
"name": "sync chromite branch [master]"
},
{
@@ -69,16 +68,15 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/chromite/cbuildbot/config_dump.json",
+ "[CWD]/chromite/cbuildbot/config_dump.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read chromite config"
},
{
"allow_subannotations": true,
"cmd": [
- "[SLAVE_BUILD]/chromite/bin/cbuildbot",
+ "[CWD]/chromite/bin/cbuildbot",
"--buildroot",
"[ROOT]/cbuild/etc_master",
"--clobber",
@@ -88,7 +86,7 @@
"--remote-version=4",
"xxx-fakeboard-fakebuild"
],
- "cwd": "[SLAVE_BUILD]",
+ "cwd": "[CWD]",
"name": "cbuildbot [xxx-fakeboard-fakebuild]"
},
{

Powered by Google App Engine
This is Rietveld 408576698