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

Unified Diff: scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: 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/recipe_modules/swarming/example.expected/basic_0.5.json
diff --git a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.json b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.json
index fe2022bb8a0852b87346fc4d45b0f8f3e6ba78c0..2da667c3d750905d75a2ee60a6ab726014cce561 100644
--- a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.json
+++ b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.5.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",
@@ -205,6 +210,7 @@
"joe",
"hash_for_win"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] hello_world on Windows-7-SP1",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -225,7 +231,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -277,6 +283,7 @@
"joe",
"hash_for_linux"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] hello_world on Ubuntu-12.04",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -303,7 +310,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -355,6 +362,7 @@
"joe",
"hash_for_mac"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] hello_world on Mac-10.9",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -376,13 +384,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",
@@ -394,8 +403,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@@@",
@@ -444,7 +454,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -456,8 +466,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@@@",
@@ -540,7 +551,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -552,8 +563,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@@@",
@@ -603,8 +615,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@@@@",

Powered by Google App Engine
This is Rietveld 408576698