| Index: scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_paladin.json
|
| diff --git a/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_paladin.json b/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_paladin.json
|
| index 8230e82bf4082f93fe32b99205a8a0fa31ef47f0..0bba530eeeb8249c22c47950b4428e57f3a8f91b 100644
|
| --- a/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_paladin.json
|
| +++ b/scripts/slave/recipes/cros/cbuildbot.expected/chromiumos_paladin.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]"
|
| },
|
| @@ -61,7 +60,6 @@
|
| "--attempts",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Fetch manifest config",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@<br/>Chromite branch: master@@@",
|
| @@ -90,7 +88,7 @@
|
| {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| - "[SLAVE_BUILD]/chromite/bin/cbuildbot",
|
| + "[CWD]/chromite/bin/cbuildbot",
|
| "--buildroot",
|
| "[ROOT]/cbuild/external_master",
|
| "--buildbot",
|
| @@ -102,7 +100,7 @@
|
| "1337",
|
| "x86-generic-paladin"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| + "cwd": "[CWD]",
|
| "name": "cbuildbot [x86-generic-paladin]"
|
| },
|
| {
|
|
|