Index: scripts/slave/recipes/infra/infra_continuous.expected/infra_internal.json |
diff --git a/scripts/slave/recipes/infra/infra_continuous.expected/infra_internal.json b/scripts/slave/recipes/infra/infra_continuous.expected/infra_internal.json |
index 8977a41f0f8af96e31e5b6a709b6f0ae3a2c3acd..5c1b887de7e4156d64932d73ed48ff548ba7cb6f 100644 |
--- a/scripts/slave/recipes/infra/infra_continuous.expected/infra_internal.json |
+++ b/scripts/slave/recipes/infra/infra_continuous.expected/infra_internal.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlavename", |
"--spec", |
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra_internal', 'url': 'https://chrome-internal.googlesource.com/infra/infra_internal.git'}]", |
"--root", |
"infra_internal", |
"--revision_mapping_file", |
"{\"infra_internal\": \"got_revision\"}", |
"--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]" |
}, |
@@ -63,6 +64,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -75,52 +77,56 @@ |
"test.py", |
"test" |
], |
- "cwd": "[CWD]/infra_internal", |
+ "cwd": "[SLAVE_BUILD]/infra_internal", |
"name": "infra python tests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/infra_internal/go/env.py", |
+ "[SLAVE_BUILD]/infra_internal/go/env.py", |
"go", |
"version" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "go third parties" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/infra_internal/go/env.py", |
+ "[SLAVE_BUILD]/infra_internal/go/env.py", |
"python", |
- "[CWD]/infra_internal/go/test.py" |
+ "[SLAVE_BUILD]/infra_internal/go/test.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "infra go tests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/infra_internal/build/build.py", |
+ "[SLAVE_BUILD]/infra_internal/build/build.py", |
"--builder", |
"infra-internal-continuous" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cipd - build packages" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/infra_internal/build/test_packages.py" |
+ "[SLAVE_BUILD]/infra_internal/build/test_packages.py" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cipd - test packages integrity" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/infra_internal/build/build.py", |
+ "[SLAVE_BUILD]/infra_internal/build/build.py", |
"--no-rebuild", |
"--upload", |
"--service-account-json", |
@@ -134,6 +140,7 @@ |
"git_repository:https://chrome-internal.googlesource.com/infra/infra_internal", |
"git_revision:0a18b32e3a93913e1090d1ee6b8965c6dc3116d6" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "cipd - upload packages", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |