Stop uploading nanobench results on Valgrind bot

It's not needed, and it's probably making the bot a lot slower.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2382313003

Review-Url: https://codereview.chromium.org/2382313003
This commit is contained in:
borenet 2016-09-30 12:39:31 -07:00 committed by Commit bot
parent d5603e670b
commit 9c8a32ff45
5 changed files with 758 additions and 238 deletions

View File

@ -144,4 +144,19 @@ class SkiaVarsApi(recipe_api.RecipeApi):
@property
def upload_perf_results(self):
# TODO(borenet): Move this into the swarm_perf recipe.
return ('Release' in self.m.properties['buildername'])
if 'Release' not in self.m.properties['buildername']:
return False
skip_upload_bots = [
'ASAN',
'Coverage',
'MSAN',
'TSAN',
'UBSAN',
'Valgrind',
]
upload_perf_results = True
for s in skip_upload_bots:
if s in self.m.properties['buildername']:
upload_perf_results = False
break
return upload_perf_results

View File

@ -59,50 +59,6 @@
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data"
],
"env": {
"PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
"511"
],
"name": "makedirs data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"valgrind",
@ -169,29 +125,7 @@
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123_1337018001.json",
"--properties",
"gitHash",
"abc123",
"build_number",
"5",
"--key",
"arch",
"x86_64",
"compiler",
"GCC",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"GTX550Ti",
"extra_config",
"Valgrind",
"model",
"ShuttleA",
"os",
"Ubuntu"
"~inc1.webp"
],
"env": {
"BUILDTYPE": "Release",
@ -267,28 +201,6 @@
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123_1337018001.json",
"--properties",
"gitHash",
"abc123",
"build_number",
"5",
"--key",
"arch",
"x86_64",
"compiler",
"GCC",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"GTX550Ti",
"extra_config",
"Valgrind",
"model",
"ShuttleA",
"os",
"Ubuntu",
"--abandonGpuContext",
"--nocpu"
],
@ -299,28 +211,6 @@
},
"name": "nanobench --abandonGpuContext"
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
"511"
],
"name": "makedirs perf_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

View File

@ -81,50 +81,6 @@
],
"name": "write SVG_VERSION"
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data"
],
"env": {
"PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data",
"511"
],
"name": "makedirs data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"valgrind",
@ -191,35 +147,7 @@
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data/nanobench_abc123_1337018001.json",
"--properties",
"gitHash",
"abc123",
"build_number",
"5",
"issue",
"2100",
"patchset",
"2",
"patch_storage",
"gerrit",
"--key",
"arch",
"x86_64",
"compiler",
"GCC",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"GTX550Ti",
"extra_config",
"Valgrind",
"model",
"ShuttleA",
"os",
"Ubuntu"
"~inc1.webp"
],
"env": {
"BUILDTYPE": "Release",
@ -295,34 +223,6 @@
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data/nanobench_abc123_1337018001.json",
"--properties",
"gitHash",
"abc123",
"build_number",
"5",
"issue",
"2100",
"patchset",
"2",
"patch_storage",
"gerrit",
"--key",
"arch",
"x86_64",
"compiler",
"GCC",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"GTX550Ti",
"extra_config",
"Valgrind",
"model",
"ShuttleA",
"os",
"Ubuntu",
"--abandonGpuContext",
"--nocpu"
],
@ -333,28 +233,6 @@
},
"name": "nanobench --abandonGpuContext"
},
{
"cmd": [
"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",
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data",
"511"
],
"name": "makedirs perf_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,

View File

@ -0,0 +1,735 @@
[
{
"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-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"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": "[SLAVE_BUILD]/skia",
"name": "git rev-parse",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"python",
"-c",
"\"print 'abc123'\""
],
"name": "got_revision",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@got_revision@\"abc123\"@@@"
]
},
{
"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": "[SLAVE_BUILD]/skia",
"name": "fix filemodes",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@for r, _, files in os.walk(os.getcwd()):@@@",
"@@@STEP_LOG_LINE@python.inline@ for fname in files:@@@",
"@@@STEP_LOG_LINE@python.inline@ f = os.path.join(r, fname)@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.isfile(f):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.access(f, os.X_OK):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.chmod(f, 0755)@@@",
"@@@STEP_LOG_LINE@python.inline@ else:@@@",
"@@@STEP_LOG_LINE@python.inline@ os.chmod(f, 0644)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
"[SLAVE_BUILD]/swarming.client",
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
"name": "git setup (swarming_client)"
},
{
"cmd": [
"git",
"retry",
"fetch",
"origin",
"master"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "git fetch (swarming_client)"
},
{
"cmd": [
"git",
"checkout",
"-f",
"FETCH_HEAD"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
"cmd": [
"git",
"rev-parse",
"HEAD"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
]
},
{
"cmd": [
"git",
"clean",
"-f",
"-d",
"-x"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
"cmd": [
"git",
"submodule",
"sync"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
"cmd": [
"git",
"submodule",
"update",
"--init",
"--recursive"
],
"cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule update (swarming_client)"
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/swarming.py",
"--version"
],
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_TEXT@0.8.6@@@"
]
},
{
"cmd": [
"download_from_google_storage",
"--no_resume",
"--platform=linux*",
"--no_auth",
"--bucket",
"chromium-luci",
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "download luci-go linux"
},
{
"cmd": [
"download_from_google_storage",
"--no_resume",
"--platform=darwin",
"--no_auth",
"--bucket",
"chromium-luci",
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "download luci-go mac"
},
{
"cmd": [
"download_from_google_storage",
"--no_resume",
"--platform=win32",
"--no_auth",
"--bucket",
"chromium-luci",
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
},
"name": "download luci-go win"
},
{
"cmd": [
"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"
],
"env": {
"PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree luci-go",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"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",
"0"
],
"name": "Copy Go binary"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"help"
],
"name": "gsutil help"
},
{
"cmd": [
"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",
"511"
],
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"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 \"--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"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
"[SLAVE_BUILD]/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"
],
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@swarm_hashes@{\"compile_skia\": \"[dummy hash for compile_skia]\"}@@@"
]
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
"--isolate-server",
"https://isolateserver.appspot.com",
"--priority",
"90",
"--shards",
"1",
"--task-name",
"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
"72000",
"--io-timeout",
"2400",
"--hard-timeout",
"14400",
"--dimension",
"gpu",
"none",
"--dimension",
"os",
"Ubuntu",
"--dimension",
"pool",
"Skia",
"--tag",
"allow_milo:1",
"--tag",
"buildername:Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"--tag",
"buildnumber:5",
"--tag",
"data:[dummy hash for compile_skia]",
"--tag",
"master:client.skia",
"--tag",
"name:compile_skia",
"--tag",
"os:Ubuntu",
"--tag",
"revision:abc123",
"--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
"--idempotent",
"[dummy hash for compile_skia]",
"--",
"--workdir",
"../../..",
"swarm_compile",
"buildername=Build-Ubuntu-GCC-x86_64-Release-Valgrind",
"mastername=client.skia.compile",
"buildnumber=1",
"slavename=skiabot-dummy-compile-slave",
"reason=Triggered by Skia swarm_trigger Recipe",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=abc123"
],
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@"
]
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
"--decorate",
"--print-status-updates",
"--json",
"{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
"--task-summary-json",
"/path/to/tmp/json"
],
"name": "compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"shards\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"abandoned_ts\": null, @@@",
"@@@STEP_LOG_LINE@json.output@ \"bot_id\": \"vm30\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"durations\": [@@@",
"@@@STEP_LOG_LINE@json.output@ 5.7, @@@",
"@@@STEP_LOG_LINE@json.output@ 31.5@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"exit_codes\": [@@@",
"@@@STEP_LOG_LINE@json.output@ 0, @@@",
"@@@STEP_LOG_LINE@json.output@ 0@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"148aa78d7aa0000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"internal_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated_out\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated\": \"abc123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"namespace\": \"default-gzip\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"blah\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"outputs\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"Heart beat succeeded on win32.\\n\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"Foo\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"state\": 112, @@@",
"@@@STEP_LOG_LINE@json.output@ \"try_number\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"user\": \"unknown\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_LINK@shard #0 isolated out@blah@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"name": "read skp VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"name": "read skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"name": "read svg VERSION"
},
{
"cmd": [
"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",
"511"
],
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"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 \"--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"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
"[SLAVE_BUILD]/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"
],
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"perf_skia\": \"[dummy hash for perf_skia]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@swarm_hashes@{\"perf_skia\": \"[dummy hash for perf_skia]\"}@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nif not isolated.get('includes'):\n isolated['includes'] = []\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",
"abc123"
],
"name": "add_isolated_input",
"~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@with open(sys.argv[1]) as f:@@@",
"@@@STEP_LOG_LINE@python.inline@ isolated = json.load(f)@@@",
"@@@STEP_LOG_LINE@python.inline@if not isolated.get('includes'):@@@",
"@@@STEP_LOG_LINE@python.inline@ isolated['includes'] = []@@@",
"@@@STEP_LOG_LINE@python.inline@for h in sys.argv[2:]:@@@",
"@@@STEP_LOG_LINE@python.inline@ isolated['includes'].append(h)@@@",
"@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
"@@@STEP_LOG_LINE@python.inline@ json.dump(isolated, f, sort_keys=True)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/isolateserver.py",
"archive",
"--isolate-server",
"https://isolateserver.appspot.com",
"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated"
],
"name": "upload new .isolated file for perf_skia",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
"--isolate-server",
"https://isolateserver.appspot.com",
"--priority",
"90",
"--shards",
"1",
"--task-name",
"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
"172800",
"--io-timeout",
"3600",
"--hard-timeout",
"32400",
"--dimension",
"gpu",
"10de:1244",
"--dimension",
"os",
"Ubuntu",
"--dimension",
"pool",
"Skia",
"--tag",
"allow_milo:1",
"--tag",
"buildername:Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"--tag",
"buildnumber:5",
"--tag",
"data:def456",
"--tag",
"master:client.skia",
"--tag",
"name:perf_skia",
"--tag",
"os:Ubuntu",
"--tag",
"revision:abc123",
"--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:perf_skia on Ubuntu",
"--cipd-package",
"skp:skia/bots/skp:version:0",
"--cipd-package",
"skimage:skia/bots/skimage:version:0",
"--cipd-package",
"svg:skia/bots/svg:version:0",
"def456",
"--",
"--workdir",
"../../..",
"swarm_perf",
"buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
"mastername=client.skia",
"buildnumber=5",
"slavename=skiabot-linux-swarm-000",
"reason=Triggered by Skia swarm_trigger Recipe",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=abc123"
],
"name": "[trigger] perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@"
]
},
{
"cmd": [
"python",
"-u",
"[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
"--decorate",
"--print-status-updates",
"--json",
"{\"base_task_name\": \"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\", \"tasks\": {\"perf_skia/Ubuntu/def456/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
"--task-summary-json",
"/path/to/tmp/json"
],
"name": "perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"shards\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"abandoned_ts\": null, @@@",
"@@@STEP_LOG_LINE@json.output@ \"bot_id\": \"vm30\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"durations\": [@@@",
"@@@STEP_LOG_LINE@json.output@ 5.7, @@@",
"@@@STEP_LOG_LINE@json.output@ 31.5@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"exit_codes\": [@@@",
"@@@STEP_LOG_LINE@json.output@ 0, @@@",
"@@@STEP_LOG_LINE@json.output@ 0@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"148aa78d7aa0000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"internal_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated_out\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated\": \"abc123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"namespace\": \"default-gzip\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"blah\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"outputs\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"Heart beat succeeded on win32.\\n\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"Foo\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"state\": 112, @@@",
"@@@STEP_LOG_LINE@json.output@ \"try_number\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"user\": \"unknown\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_LINK@shard #0 isolated out@blah@@@",
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

View File

@ -48,6 +48,7 @@ TEST_BUILDERS = {
'Infra-PerCommit',
'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot',
'Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs',
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android',
'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan',
'Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release',
@ -694,9 +695,10 @@ def test_for_bot(api, builder, mastername, slavename, testname=None):
test += api.step_data(
'upload new .isolated file for perf_skia',
stdout=api.raw_io.output('def456 XYZ.isolated'))
test += api.step_data(
'upload new .isolated file for upload_nano_results_skia',
stdout=api.raw_io.output('def456 XYZ.isolated'))
if 'Valgrind' not in builder:
test += api.step_data(
'upload new .isolated file for upload_nano_results_skia',
stdout=api.raw_io.output('def456 XYZ.isolated'))
if 'Housekeeper' in builder and 'RecreateSKPs' not in builder:
test += api.step_data(
'upload new .isolated file for housekeeper_skia',