Index: scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json |
diff --git a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json |
index a5c3e265b4d3b25365640d894c0f84e47b116722..bc4a8857e2080f2dddd2b76f705bf6d6041cd12a 100644 |
--- a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json |
+++ b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json |
@@ -5,10 +5,11 @@ |
"-u", |
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", |
"--path", |
- "[CWD]/swarming.client", |
+ "[SLAVE_BUILD]/swarming.client", |
"--url", |
"https://chromium.googlesource.com/external/swarming.client.git" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "git setup (swarming_client)" |
}, |
{ |
@@ -19,7 +20,7 @@ |
"origin", |
"master" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git fetch (swarming_client)" |
}, |
{ |
@@ -29,7 +30,7 @@ |
"-f", |
"FETCH_HEAD" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git checkout (swarming_client)" |
}, |
{ |
@@ -38,7 +39,7 @@ |
"rev-parse", |
"HEAD" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "read revision", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -53,7 +54,7 @@ |
"-d", |
"-x" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git clean (swarming_client)" |
}, |
{ |
@@ -62,7 +63,7 @@ |
"submodule", |
"sync" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "submodule sync (swarming_client)" |
}, |
{ |
@@ -73,16 +74,17 @@ |
"--init", |
"--recursive" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "submodule update (swarming_client)" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"--version" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "swarming.py --version", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -93,12 +95,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/isolate.py", |
+ "[SLAVE_BUILD]/swarming.client/isolate.py", |
"archive", |
"--isolate", |
- "[CWD]/swarming.client/example/payload/hello_world.isolate", |
+ "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate", |
"--isolated", |
- "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated", |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated", |
"--isolate-server", |
"https://isolateserver-dev.appspot.com", |
"--config-variable", |
@@ -106,6 +108,7 @@ |
"win", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive for win", |
"stdout": "/path/to/tmp/" |
}, |
@@ -113,12 +116,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/isolate.py", |
+ "[SLAVE_BUILD]/swarming.client/isolate.py", |
"archive", |
"--isolate", |
- "[CWD]/swarming.client/example/payload/hello_world.isolate", |
+ "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate", |
"--isolated", |
- "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated", |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated", |
"--isolate-server", |
"https://isolateserver-dev.appspot.com", |
"--config-variable", |
@@ -126,6 +129,7 @@ |
"linux", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive for linux", |
"stdout": "/path/to/tmp/" |
}, |
@@ -133,12 +137,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/isolate.py", |
+ "[SLAVE_BUILD]/swarming.client/isolate.py", |
"archive", |
"--isolate", |
- "[CWD]/swarming.client/example/payload/hello_world.isolate", |
+ "[SLAVE_BUILD]/swarming.client/example/payload/hello_world.isolate", |
"--isolated", |
- "[TMP]/hello_isolated_world_tmp_1/hello_world.isolated", |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/hello_world.isolated", |
"--isolate-server", |
"https://isolateserver-dev.appspot.com", |
"--config-variable", |
@@ -146,6 +150,7 @@ |
"mac", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive for mac", |
"stdout": "/path/to/tmp/" |
}, |
@@ -153,7 +158,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -203,6 +208,7 @@ |
"joe", |
"hash_for_win" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] hello_world on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -223,7 +229,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -273,6 +279,7 @@ |
"joe", |
"hash_for_linux" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] hello_world on Ubuntu-12.04", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -299,7 +306,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -349,6 +356,7 @@ |
"joe", |
"hash_for_mac" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] hello_world on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -370,13 +378,14 @@ |
"echo", |
"running something locally" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "local step" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -389,8 +398,9 @@ |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
- "[TMP]/hello_isolated_world_tmp_1/task_output_dir" |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "hello_world on Windows-7-SP1", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
@@ -439,7 +449,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -452,8 +462,9 @@ |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
- "[TMP]/hello_isolated_world_tmp_1/task_output_dir" |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "hello_world on Ubuntu-12.04", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
@@ -536,7 +547,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm-dev.appspot.com", |
@@ -549,8 +560,9 @@ |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
- "[TMP]/hello_isolated_world_tmp_1/task_output_dir" |
+ "[TMP_BASE]/hello_isolated_world_tmp_1/task_output_dir" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "hello_world on Mac-10.9", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
@@ -600,8 +612,9 @@ |
"python", |
"-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
- "[TMP]/hello_isolated_world_tmp_1" |
+ "[TMP_BASE]/hello_isolated_world_tmp_1" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree remove temp dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |