| Index: scripts/slave/recipe_modules/chromite/example.expected/basic.json
|
| diff --git a/scripts/slave/recipe_modules/chromite/example.expected/basic.json b/scripts/slave/recipe_modules/chromite/example.expected/basic.json
|
| index 9890e6a5f90adc5947fef0f09ede049f7f440c1e..cdbe2a0c1edef68a0fe02f90a5d5abbea4527303 100644
|
| --- a/scripts/slave/recipe_modules/chromite/example.expected/basic.json
|
| +++ b/scripts/slave/recipe_modules/chromite/example.expected/basic.json
|
| @@ -1,29 +1,27 @@
|
| [
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "init",
|
| "-u",
|
| "https://chromium.googlesource.com/chromiumos/manifest.git",
|
| "--repo-url",
|
| "https://chromium.googlesource.com/external/repo.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo init"
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo sync"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/chromite/bin/cros_sdk",
|
| + "[CWD]/chromite/bin/cros_sdk",
|
| "--cache-dir",
|
| ".cache",
|
| "--",
|
| @@ -31,45 +29,41 @@
|
| "--board",
|
| "amd64-generic"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "setup board"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/chromite/bin/cros_sdk",
|
| + "[CWD]/chromite/bin/cros_sdk",
|
| "--",
|
| "./build_packages",
|
| "--board",
|
| "amd64-generic"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "build packages"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/chromite/bin/cros_sdk",
|
| + "[CWD]/chromite/bin/cros_sdk",
|
| "var1=value",
|
| "--",
|
| "echo",
|
| "hello"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cros_sdk"
|
| },
|
| {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| - "[SLAVE_BUILD]/chromite/bin/cbuildbot",
|
| + "[CWD]/chromite/bin/cbuildbot",
|
| "--clobber",
|
| "--build-dir",
|
| "/here/there",
|
| "amd64-generic-full"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cbuildbot"
|
| },
|
| {
|
| @@ -77,10 +71,9 @@
|
| "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",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@config@{@@@",
|
|
|