Index: infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json |
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json |
index 14694da63e777824d517ba25056424b5cddd3fd9..05c11535e3b4cb44c91a888268a7bdee35981527 100644 |
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json |
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json |
@@ -1,11 +1,31 @@ |
[ |
{ |
"cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n", |
+ "{\"buildername\": \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot\", \"buildnumber\": 5, \"issue\": 500, \"mastername\": \"client.skia\", \"patchset\": 1, \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"skiabot-linux-swarm-000\"}" |
+ ], |
+ "name": "print properties", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import json@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ content = json.load(f)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@print json.dumps(content, indent=2)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
"git", |
"rev-parse", |
"HEAD" |
], |
- "cwd": "[ROOT]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git rev-parse", |
"stdout": "/path/to/tmp/" |
}, |
@@ -24,9 +44,19 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "", |
+ "[SLAVE_BUILD]/.gclient" |
+ ], |
+ "name": "write .gclient" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n" |
], |
- "cwd": "[ROOT]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "fix filemodes", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@import os@@@", |
@@ -140,7 +170,7 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[ROOT]/skia/infra/bots/tools/luci-go/linux64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64" |
], |
"name": "download luci-go linux" |
}, |
@@ -153,7 +183,7 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[ROOT]/skia/infra/bots/tools/luci-go/mac64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64" |
], |
"name": "download luci-go mac" |
}, |
@@ -166,7 +196,7 @@ |
"--bucket", |
"chromium-luci", |
"-d", |
- "[ROOT]/skia/infra/bots/tools/luci-go/win64" |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64" |
], |
"name": "download luci-go win" |
}, |
@@ -178,7 +208,7 @@ |
"[SLAVE_BUILD]/luci-go" |
], |
"env": { |
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts" |
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" |
}, |
"name": "rmtree luci-go", |
"~followup_annotations": [ |
@@ -197,7 +227,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", |
- "[ROOT]/skia/infra/bots/tools/luci-go", |
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go", |
"[SLAVE_BUILD]/luci-go", |
"0" |
], |
@@ -219,11 +249,11 @@ |
"cmd": [ |
"python", |
"-u", |
- "[ROOT]/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-Trybot" |
], |
- "cwd": "[ROOT]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "exec buildbot_spec.py", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
@@ -327,7 +357,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json" |
], |
"name": "Write compile_skia.isolated.gen.json" |
@@ -509,7 +539,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[ROOT]/skia/infra/bots/assets/skp/VERSION", |
+ "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", |
"/path/to/tmp/" |
], |
"name": "read skp VERSION" |
@@ -519,7 +549,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[ROOT]/skia/infra/bots/assets/skimage/VERSION", |
+ "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", |
"/path/to/tmp/" |
], |
"name": "read skimage VERSION" |
@@ -551,7 +581,7 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}", |
"[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json" |
], |
"name": "Write perf_skia.isolated.gen.json" |
@@ -719,7 +749,7 @@ |
"[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia" |
], |
"env": { |
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts" |
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" |
}, |
"name": "rmtree perf_skia", |
"~followup_annotations": [ |
@@ -803,7 +833,7 @@ |
"--format=%at", |
"-s" |
], |
- "cwd": "[ROOT]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"name": "git show", |
"stdout": "/path/to/tmp/" |
}, |
@@ -815,7 +845,7 @@ |
"[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot/data" |
], |
"env": { |
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts" |
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" |
}, |
"name": "rmtree data", |
"~followup_annotations": [ |
@@ -873,7 +903,7 @@ |
"[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/depot_tools/third_party/gsutil/gsutil", |
"500" |
], |
- "cwd": "[ROOT]/skia", |
+ "cwd": "[SLAVE_BUILD]/skia", |
"env": { |
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto", |
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto" |