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

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.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/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 48e57a08c1bcba867ab4b7895c8ad274c4deb955..9d901ecdf186efdaaf8f760bc497714eecd8b1b2 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": "[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",
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -164,10 +168,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)"
},
{
@@ -178,7 +183,7 @@
"origin",
"master"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -188,7 +193,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -197,7 +202,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -212,7 +217,7 @@
"-d",
"-x"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -221,7 +226,7 @@
"submodule",
"sync"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -232,16 +237,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": [
@@ -257,8 +263,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"
},
{
@@ -270,8 +277,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"
},
{
@@ -283,8 +291,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"
},
{
@@ -292,8 +301,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@@@@",
@@ -311,10 +321,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"
},
{
@@ -322,9 +333,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@@@@",
@@ -344,9 +356,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@@@@",
@@ -366,9 +379,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"
},
{
@@ -376,15 +390,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@{@@@",
@@ -398,11 +413,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 (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -441,9 +456,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@@@@",
@@ -463,9 +479,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"
},
{
@@ -473,15 +490,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@{@@@",
@@ -496,9 +514,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@@@@",
@@ -517,12 +536,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/"
},
@@ -530,7 +550,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -594,6 +614,7 @@
"issue=500",
"revision=164710"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -614,7 +635,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -626,6 +647,7 @@
"--task-summary-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -675,9 +697,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]/tmp",
+ "[SLAVE_BUILD]/tmp",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -697,9 +720,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/tmp/SKP_VERSION",
+ "[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -707,9 +731,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/skia/SKP_VERSION",
+ "[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -717,9 +742,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/tmp/SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -727,9 +753,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/skia/SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -737,9 +764,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 (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -759,9 +787,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/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"
+ "{\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"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Write perf_skia.isolated.gen.json"
},
{
@@ -769,15 +798,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/perf_skia.isolated.gen.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -792,10 +822,11 @@
"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-perf_skia.isolated",
+ "[SLAVE_BUILD]/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@@@@",
@@ -814,12 +845,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-perf_skia.isolated"
+ "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for perf_skia",
"stdout": "/path/to/tmp/"
},
@@ -827,7 +859,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -890,6 +922,7 @@
"issue=500",
"revision=164710"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -911,8 +944,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]/swarming_temp_dir/outputs/perf_skia"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree results_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -929,7 +963,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -941,8 +975,9 @@
"--task-summary-json",
"/path/to/tmp/json",
"--task-output-dir",
- "[CWD]/swarming_temp_dir/outputs/perf_skia"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -995,7 +1030,7 @@
"--format=%at",
"-s"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git show",
"stdout": "/path/to/tmp/"
},
@@ -1004,8 +1039,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]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data"
+ "[SLAVE_BUILD]/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@@@@",
@@ -1023,9 +1059,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]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data",
+ "[SLAVE_BUILD]/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@@@@",
@@ -1045,9 +1082,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[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"
+ "[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": "[SLAVE_BUILD]",
"name": "perf_results"
},
{
@@ -1057,12 +1095,12 @@
"RECIPE_MODULE[build::skia]/resources/upload_bench_results.py",
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot",
"5",
- "[CWD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data",
+ "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data",
"164710",
- "[ROOT]/b/depot_tools/third_party/gsutil/gsutil",
+ "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
"500"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"

Powered by Google App Engine
This is Rietveld 408576698