Index: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json |
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json |
index 9ac2c33b47c7bce10bfe989561332d9275cc3af0..9d2c3aa348981093a258469102d20582e6486310 100644 |
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json |
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json |
@@ -7,7 +7,7 @@ |
"origin", |
"https://skia.googlesource.com/skia.git" |
], |
- "cwd": "[CWD]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git remote set-url" |
}, |
{ |
@@ -15,7 +15,7 @@ |
"git", |
"fetch" |
], |
- "cwd": "[CWD]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git fetch" |
}, |
{ |
@@ -25,7 +25,7 @@ |
"--hard", |
"abc123" |
], |
- "cwd": "[CWD]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git reset" |
}, |
{ |
@@ -35,7 +35,7 @@ |
"-d", |
"-f" |
], |
- "cwd": "[CWD]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git clean" |
}, |
{ |
@@ -47,6 +47,7 @@ |
"--spec", |
"cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -56,10 +57,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py", |
+ "[BUILD]/scripts/slave/gclient_safe_revert.py", |
".", |
- "[ROOT]/b/depot_tools/gclient" |
+ "[DEPOT_TOOLS]/gclient" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "gclient revert" |
}, |
{ |
@@ -77,6 +79,7 @@ |
"--output-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -97,9 +100,9 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/b/depot_tools/apply_issue.py", |
+ "[DEPOT_TOOLS]/apply_issue.py", |
"-r", |
- "[CWD]/skia", |
+ "[SLAVE_BUILD]/skia", |
"-i", |
"500", |
"-p", |
@@ -108,6 +111,7 @@ |
"https://codereview.chromium.org", |
"--no-auth" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "apply_issue", |
"~followup_annotations": [ |
"@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" |
@@ -117,11 +121,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/skia/tools/buildbot_spec.py", |
+ "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
"Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot" |
], |
- "cwd": "[CWD]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "exec buildbot_spec.py", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -161,10 +165,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)" |
}, |
{ |
@@ -175,7 +180,7 @@ |
"origin", |
"master" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git fetch (swarming_client)" |
}, |
{ |
@@ -185,7 +190,7 @@ |
"-f", |
"FETCH_HEAD" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git checkout (swarming_client)" |
}, |
{ |
@@ -194,7 +199,7 @@ |
"rev-parse", |
"HEAD" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "read revision", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -209,7 +214,7 @@ |
"-d", |
"-x" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "git clean (swarming_client)" |
}, |
{ |
@@ -218,7 +223,7 @@ |
"submodule", |
"sync" |
], |
- "cwd": "[CWD]/swarming.client", |
+ "cwd": "[SLAVE_BUILD]/swarming.client", |
"name": "submodule sync (swarming_client)" |
}, |
{ |
@@ -229,16 +234,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": [ |
@@ -254,8 +260,9 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[CWD]/skia/infra/bots/tools/luci-go/linux64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go linux" |
}, |
{ |
@@ -267,8 +274,9 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[CWD]/skia/infra/bots/tools/luci-go/mac64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go mac" |
}, |
{ |
@@ -280,8 +288,9 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[CWD]/skia/infra/bots/tools/luci-go/win64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go win" |
}, |
{ |
@@ -289,8 +298,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", |
- "[CWD]/luci-go" |
+ "[SLAVE_BUILD]/luci-go" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "rmtree Go binary dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -308,10 +318,11 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", |
- "[CWD]/skia/infra/bots/tools/luci-go", |
- "[CWD]/luci-go", |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", |
+ "[SLAVE_BUILD]/luci-go", |
"0" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Copy Go binary" |
}, |
{ |
@@ -319,9 +330,10 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[ROOT]/b/build/third_party/infra", |
+ "[BUILD]/third_party/infra", |
"511" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "makedirs third_party_infra", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -341,9 +353,10 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[CWD]/swarming_temp_dir", |
+ "[SLAVE_BUILD]/swarming_temp_dir", |
"511" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "makedirs swarming tmp dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -363,9 +376,10 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/b/build/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[ROOT]/b/build/scripts/slave/recipes/skia\", \n \"version\": 1\n}", |
- "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
+ "{\n \"args\": [\n \"--isolate\", \n \"[BUILD]/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n \"version\": 1\n}", |
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Write isolate_recipes.isolated.gen.json" |
}, |
{ |
@@ -373,15 +387,16 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[CWD]/swarming.client", |
+ "[SLAVE_BUILD]/swarming.client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -396,9 +411,10 @@ |
"python", |
"-u", |
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
- "[CWD]/swarming_temp_dir", |
+ "[SLAVE_BUILD]/swarming_temp_dir", |
"511" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "makedirs swarming tmp dir (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -418,9 +434,10 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[CWD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[ROOT]/b/build\"\n ], \n \"dir\": \"[CWD]\", \n \"version\": 1\n}", |
- "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
+ "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "Write compile_skia.isolated.gen.json" |
}, |
{ |
@@ -428,15 +445,16 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[CWD]/swarming.client", |
+ "[SLAVE_BUILD]/swarming.client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
+ "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -451,9 +469,10 @@ |
"python", |
"-u", |
"\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n", |
- "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated", |
+ "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated", |
"[dummy hash for isolate_recipes]" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "add_isolated_input", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -472,12 +491,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/isolateserver.py", |
+ "[SLAVE_BUILD]/swarming.client/isolateserver.py", |
"archive", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
- "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated" |
+ "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "upload new .isolated file for compile_skia", |
"stdout": "/path/to/tmp/" |
}, |
@@ -485,7 +505,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -549,6 +569,7 @@ |
"issue=500", |
"revision=164710" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] compile_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -569,7 +590,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]/swarming.client/swarming.py", |
+ "[SLAVE_BUILD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -581,6 +602,7 @@ |
"--task-summary-json", |
"/path/to/tmp/json" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "compile_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |