Index: scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json |
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json |
index 9d901ecdf186efdaaf8f760bc497714eecd8b1b2..48e57a08c1bcba867ab4b7895c8ad274c4deb955 100644 |
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json |
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json |
@@ -7,7 +7,7 @@ |
"origin", |
"https://skia.googlesource.com/skia.git" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "git remote set-url" |
}, |
{ |
@@ -15,7 +15,7 @@ |
"git", |
"fetch" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "git fetch" |
}, |
{ |
@@ -25,7 +25,7 @@ |
"--hard", |
"abc123" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "git reset" |
}, |
{ |
@@ -35,7 +35,7 @@ |
"-d", |
"-f" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "git clean" |
}, |
{ |
@@ -47,7 +47,6 @@ |
"--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]" |
}, |
@@ -57,11 +56,10 @@ |
"cmd": [ |
"python", |
"-u", |
- "[BUILD]/scripts/slave/gclient_safe_revert.py", |
+ "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py", |
".", |
- "[DEPOT_TOOLS]/gclient" |
+ "[ROOT]/b/depot_tools/gclient" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "gclient revert" |
}, |
{ |
@@ -79,7 +77,6 @@ |
"--output-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -100,9 +97,9 @@ |
"cmd": [ |
"python", |
"-u", |
- "[DEPOT_TOOLS]/apply_issue.py", |
+ "[ROOT]/b/depot_tools/apply_issue.py", |
"-r", |
- "[SLAVE_BUILD]/skia", |
+ "[CWD]/skia", |
"-i", |
"500", |
"-p", |
@@ -111,7 +108,6 @@ |
"https://codereview.chromium.org", |
"--no-auth" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "apply_issue", |
"~followup_annotations": [ |
"@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@" |
@@ -121,11 +117,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
+ "[CWD]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "exec buildbot_spec.py", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -168,11 +164,10 @@ |
"-u", |
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", |
"--path", |
- "[SLAVE_BUILD]/swarming.client", |
+ "[CWD]/swarming.client", |
"--url", |
"https://chromium.googlesource.com/external/swarming.client.git" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "git setup (swarming_client)" |
}, |
{ |
@@ -183,7 +178,7 @@ |
"origin", |
"master" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "git fetch (swarming_client)" |
}, |
{ |
@@ -193,7 +188,7 @@ |
"-f", |
"FETCH_HEAD" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "git checkout (swarming_client)" |
}, |
{ |
@@ -202,7 +197,7 @@ |
"rev-parse", |
"HEAD" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "read revision", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -217,7 +212,7 @@ |
"-d", |
"-x" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "git clean (swarming_client)" |
}, |
{ |
@@ -226,7 +221,7 @@ |
"submodule", |
"sync" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "submodule sync (swarming_client)" |
}, |
{ |
@@ -237,17 +232,16 @@ |
"--init", |
"--recursive" |
], |
- "cwd": "[SLAVE_BUILD]/swarming.client", |
+ "cwd": "[CWD]/swarming.client", |
"name": "submodule update (swarming_client)" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
+ "[CWD]/swarming.client/swarming.py", |
"--version" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "swarming.py --version", |
"stdout": "/path/to/tmp/", |
"~followup_annotations": [ |
@@ -263,9 +257,8 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" |
+ "[CWD]/skia/infra/bots/tools/luci-go/linux64" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go linux" |
}, |
{ |
@@ -277,9 +270,8 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" |
+ "[CWD]/skia/infra/bots/tools/luci-go/mac64" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go mac" |
}, |
{ |
@@ -291,9 +283,8 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" |
+ "[CWD]/skia/infra/bots/tools/luci-go/win64" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "download luci-go win" |
}, |
{ |
@@ -301,9 +292,8 @@ |
"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", |
- "[SLAVE_BUILD]/luci-go" |
+ "[CWD]/luci-go" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rmtree Go binary dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -321,11 +311,10 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", |
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", |
- "[SLAVE_BUILD]/luci-go", |
+ "[CWD]/skia/infra/bots/tools/luci-go", |
+ "[CWD]/luci-go", |
"0" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Copy Go binary" |
}, |
{ |
@@ -333,10 +322,9 @@ |
"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", |
- "[BUILD]/third_party/infra", |
+ "[ROOT]/b/build/third_party/infra", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs third_party_infra", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -356,10 +344,9 @@ |
"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", |
- "[SLAVE_BUILD]/swarming_temp_dir", |
+ "[CWD]/swarming_temp_dir", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs swarming tmp dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -379,10 +366,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\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" |
+ "{\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" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Write isolate_recipes.isolated.gen.json" |
}, |
{ |
@@ -390,16 +376,15 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[SLAVE_BUILD]/swarming.client", |
+ "[CWD]/swarming.client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
+ "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -413,11 +398,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", |
+ "[CWD]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
"Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "exec buildbot_spec.py (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -456,10 +441,9 @@ |
"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", |
- "[SLAVE_BUILD]/swarming_temp_dir", |
+ "[CWD]/swarming_temp_dir", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs swarming tmp dir (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -479,10 +463,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\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" |
+ "{\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" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Write compile_skia.isolated.gen.json" |
}, |
{ |
@@ -490,16 +473,15 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[SLAVE_BUILD]/swarming.client", |
+ "[CWD]/swarming.client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
+ "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -514,10 +496,9 @@ |
"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", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated", |
+ "[CWD]/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@@@@", |
@@ -536,13 +517,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/isolateserver.py", |
+ "[CWD]/swarming.client/isolateserver.py", |
"archive", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated" |
+ "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "upload new .isolated file for compile_skia", |
"stdout": "/path/to/tmp/" |
}, |
@@ -550,7 +530,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
+ "[CWD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -614,7 +594,6 @@ |
"issue=500", |
"revision=164710" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] compile_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -635,7 +614,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
+ "[CWD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -647,7 +626,6 @@ |
"--task-summary-json", |
"/path/to/tmp/json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "compile_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
@@ -697,10 +675,9 @@ |
"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", |
- "[SLAVE_BUILD]/tmp", |
+ "[CWD]/tmp", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs tmp_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -720,10 +697,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/tmp/SKP_VERSION", |
+ "[CWD]/tmp/SKP_VERSION", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Get downloaded SKP_VERSION" |
}, |
{ |
@@ -731,10 +707,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/skia/SKP_VERSION", |
+ "[CWD]/skia/SKP_VERSION", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Get expected SKP_VERSION" |
}, |
{ |
@@ -742,10 +717,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION", |
+ "[CWD]/tmp/SK_IMAGE_VERSION", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Get downloaded SK_IMAGE_VERSION" |
}, |
{ |
@@ -753,10 +727,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION", |
+ "[CWD]/skia/SK_IMAGE_VERSION", |
"/path/to/tmp/" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Get expected SK_IMAGE_VERSION" |
}, |
{ |
@@ -764,10 +737,9 @@ |
"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", |
- "[SLAVE_BUILD]/swarming_temp_dir", |
+ "[CWD]/swarming_temp_dir", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs swarming tmp dir (3)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -787,10 +759,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_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/perf_skia.isolated.gen.json" |
+ "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-perf_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/perf_skia.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "Write perf_skia.isolated.gen.json" |
}, |
{ |
@@ -798,16 +769,15 @@ |
"python", |
"-u", |
"RECIPE_MODULE[build::isolate]/resources/isolate.py", |
- "[SLAVE_BUILD]/swarming.client", |
+ "[CWD]/swarming.client", |
"batcharchive", |
"--dump-json", |
"/path/to/tmp/json", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
"--verbose", |
- "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" |
+ "[CWD]/swarming_temp_dir/perf_skia.isolated.gen.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "isolate tests (3)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -822,11 +792,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", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated", |
+ "[CWD]/swarming_temp_dir/skia-task-perf_skia.isolated", |
"[dummy hash for isolate_recipes]", |
"abc123" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "add_isolated_input (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -845,13 +814,12 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/isolateserver.py", |
+ "[CWD]/swarming.client/isolateserver.py", |
"archive", |
"--isolate-server", |
"https://isolateserver.appspot.com", |
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated" |
+ "[CWD]/swarming_temp_dir/skia-task-perf_skia.isolated" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "upload new .isolated file for perf_skia", |
"stdout": "/path/to/tmp/" |
}, |
@@ -859,7 +827,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
+ "[CWD]/swarming.client/swarming.py", |
"trigger", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -922,7 +890,6 @@ |
"issue=500", |
"revision=164710" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "[trigger] perf_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -944,9 +911,8 @@ |
"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", |
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia" |
+ "[CWD]/swarming_temp_dir/outputs/perf_skia" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rmtree results_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -963,7 +929,7 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/swarming.client/swarming.py", |
+ "[CWD]/swarming.client/swarming.py", |
"collect", |
"--swarming", |
"https://chromium-swarm.appspot.com", |
@@ -975,9 +941,8 @@ |
"--task-summary-json", |
"/path/to/tmp/json", |
"--task-output-dir", |
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia" |
+ "[CWD]/swarming_temp_dir/outputs/perf_skia" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "perf_skia on Ubuntu", |
"~followup_annotations": [ |
"@@@STEP_TEXT@swarming pending 71s@@@", |
@@ -1030,7 +995,7 @@ |
"--format=%at", |
"-s" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"name": "git show", |
"stdout": "/path/to/tmp/" |
}, |
@@ -1039,9 +1004,8 @@ |
"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", |
- "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data" |
+ "[CWD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "rmtree perf_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -1059,10 +1023,9 @@ |
"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", |
- "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data", |
+ "[CWD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs perf_dir", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -1082,10 +1045,9 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia/0/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710.json", |
- "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710_1408633190.json" |
+ "[CWD]/swarming_temp_dir/outputs/perf_skia/0/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710.json", |
+ "[CWD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710_1408633190.json" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "perf_results" |
}, |
{ |
@@ -1095,12 +1057,12 @@ |
"RECIPE_MODULE[build::skia]/resources/upload_bench_results.py", |
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot", |
"5", |
- "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data", |
+ "[CWD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data", |
"164710", |
- "[DEPOT_TOOLS]/third_party/gsutil/gsutil", |
+ "[ROOT]/b/depot_tools/third_party/gsutil/gsutil", |
"500" |
], |
- "cwd": "[SLAVE_BUILD]/skia", |
+ "cwd": "[CWD]/skia", |
"env": { |
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto", |
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto" |