diff options
| -rw-r--r-- | infra/bots/gen_tasks.go | 2 | ||||
| -rw-r--r-- | infra/bots/jobs.json | 6 | ||||
| -rw-r--r-- | infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json | 475 | ||||
| -rw-r--r-- | infra/bots/recipes/test.py | 6 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 458 |
5 files changed, 947 insertions, 0 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index d5dd92d038..216f3e687f 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -330,6 +330,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { } else if strings.Contains(parts["os"], "Mac") { gpu, ok := map[string]string{ "IntelHD6000": "8086:1626", + "IntelHD615": "8086:591e", "IntelIris5100": "8086:0a2e", }[parts["cpu_or_gpu_value"]] if !ok { @@ -339,6 +340,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { // TODO(benjaminwagner): Mac GPU bots haven't been upgraded. d["os"] = map[string]string{ "IntelHD6000": "Mac-10.13.3", + "IntelHD615": "Mac-10.13.3", "IntelIris5100": "Mac-10.13.1", }[parts["cpu_or_gpu_value"]] } else if strings.Contains(parts["os"], "ChromeOS") { diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 63b3b68de4..9d8f769cf4 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -193,6 +193,9 @@ "Perf-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All", "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All", "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer", "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer", @@ -403,6 +406,9 @@ "Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All", "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All", "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All", + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer", "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json new file mode 100644 index 0000000000..8407c37b38 --- /dev/null +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All.json @@ -0,0 +1,475 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SKP_VERSION" + ], + "infra_step": true, + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded skimage VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SK_IMAGE_VERSION" + ], + "infra_step": true, + "name": "write SK_IMAGE_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", + "/path/to/tmp/" + ], + "infra_step": true, + "name": "Get downloaded SVG VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "42", + "[START_DIR]/tmp/SVG_VERSION" + ], + "infra_step": true, + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "ensure-directory", + "--mode", + "0777", + "[START_DIR]/tmp" + ], + "infra_step": true, + "name": "makedirs tmp_dir" + }, + { + "cmd": [ + "python", + "-u", + "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", + "[START_DIR]/tmp/uninteresting_hashes.txt" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, + "infra_step": true, + "name": "get uninteresting hashes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", + "@@@STEP_LOG_LINE@python.inline@import math@@@", + "@@@STEP_LOG_LINE@python.inline@import socket@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@import time@@@", + "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'@@@", + "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", + "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", + "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", + "@@@STEP_LOG_LINE@python.inline@ try:@@@", + "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", + "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", + "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", + "@@@STEP_LOG_LINE@python.inline@ break@@@", + "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", + "@@@STEP_LOG_LINE@python.inline@ print e@@@", + "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", + "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" + ], + "name": "get swarming bot id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" + ], + "name": "get swarming task id", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@import os@@@", + "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[START_DIR]/out/Debug/dm", + "--resourcePath", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/dm", + "--colorImages", + "[START_DIR]/skimage/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "builder", + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "buildbucket_build_id", + "123454321", + "swarming_bot_id", + "skia-bot-123", + "swarming_task_id", + "123456", + "--svgs", + "[START_DIR]/svg", + "--key", + "arch", + "x86_64", + "compiler", + "Clang", + "configuration", + "Debug", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "IntelHD615", + "model", + "MacBook10.1", + "os", + "Mac", + "--uninterestingHashesFile", + "[START_DIR]/tmp/uninteresting_hashes.txt", + "--writePath", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "--dont_write", + "pdf", + "--randomProcessorTest", + "--nocpu", + "--config", + "gl", + "gldft", + "glsrgb", + "--src", + "tests", + "gm", + "image", + "colorImage", + "svg", + "--blacklist", + "_", + "svg", + "_", + "svgparse_", + "glsrgb", + "image", + "_", + "_", + "_", + "image", + "gen_platf", + "rgba32abf.bmp", + "_", + "image", + "gen_platf", + "rgb24prof.bmp", + "_", + "image", + "gen_platf", + "rgb24lprof.bmp", + "_", + "image", + "gen_platf", + "8bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "4bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "32bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "24bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "frame_larger_than_image.gif", + "_", + "image", + "gen_platf", + "inc0.png", + "_", + "image", + "gen_platf", + "inc1.png", + "_", + "image", + "gen_platf", + "inc2.png", + "_", + "image", + "gen_platf", + "inc3.png", + "_", + "image", + "gen_platf", + "inc4.png", + "_", + "image", + "gen_platf", + "inc5.png", + "_", + "image", + "gen_platf", + "inc6.png", + "_", + "image", + "gen_platf", + "inc7.png", + "_", + "image", + "gen_platf", + "inc8.png", + "_", + "image", + "gen_platf", + "inc9.png", + "_", + "image", + "gen_platf", + "inc10.png", + "_", + "image", + "gen_platf", + "inc11.png", + "_", + "image", + "gen_platf", + "inc12.png", + "_", + "image", + "gen_platf", + "inc13.png", + "_", + "image", + "gen_platf", + "inc14.png", + "_", + "image", + "gen_platf", + "incInterlaced.gif", + "_", + "image", + "gen_platf", + "inc1.gif", + "_", + "image", + "gen_platf", + "inc0.gif", + "_", + "image", + "gen_platf", + "butterfly.gif", + "_", + "image", + "gen_platf", + "testimgari.jpg", + "_", + "image", + "gen_platf", + "rle8-height-negative.bmp", + "_", + "image", + "gen_platf", + "rle4-height-negative.bmp", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW", + "--match", + "~^GrMeshTest$", + "--nonativeFonts", + "--verbose" + ], + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "dm" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 63665068f4..121e086fa0 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -705,9 +705,14 @@ def dm_flags(api, bot): match.append('~BadImage') if 'Mac' in bot and 'IntelHD6000' in bot: + # skia:7574 match.append('~^ProcessorCloneTest$') match.append('~^GrMeshTest$') + if 'Mac' in bot and 'IntelHD615' in bot: + # skia:7603 + match.append('~^GrMeshTest$') + if blacklisted: args.append('--blacklist') args.extend(blacklisted) @@ -936,6 +941,7 @@ TEST_BUILDERS = [ 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN', 'Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All', 'Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All', + 'Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All', 'Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All', 'Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All', 'Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer', diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index a3a319729a..aa5edb5402 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -1173,6 +1173,25 @@ "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All" ] }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { + "priority": 0.8, + "tasks": [ + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All" + ] + }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "priority": 0.8, + "tasks": [ + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" + ] + }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { + "priority": 0.8, + "tasks": [ + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer" + ], + "trigger": "master" + }, "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "priority": 0.8, "tasks": [ @@ -2435,6 +2454,25 @@ "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All" ] }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All" + ] + }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer" + ], + "trigger": "master" + }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "priority": 0.8, + "tasks": [ + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" + ] + }, "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "priority": 0.8, "tasks": [ @@ -9512,6 +9550,147 @@ "max_attempts": 1, "priority": 0.8 }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Release-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "perf", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "perf_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "cipd_packages": [ { @@ -19027,6 +19206,150 @@ "max_attempts": 1, "priority": 0.8 }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Debug", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Debug-CommandBuffer", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:34" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:113" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:9" + } + ], + "dependencies": [ + "Build-Mac-Clang-x86_64-Release", + "Housekeeper-PerCommit-BundleRecipes" + ], + "dimensions": [ + "gpu:8086:591e", + "os:Mac-10.13.3", + "pool:Skia" + ], + "execution_timeout_ns": 14400000000000, + "expiration_ns": 72000000000000, + "extra_args": [ + "--workdir", + "../../..", + "test", + "repository=<(REPO)", + "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 2400000000000, + "isolate": "test_skia_bundled_unix.isolate", + "max_attempts": 1, + "priority": 0.8 + }, "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "cipd_packages": [ { @@ -26642,6 +26965,60 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "dependencies": [ + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_nano_results", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, + "Upload-Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer": { + "dependencies": [ + "Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_nano_results", + "repository=<(REPO)", + "buildername=Perf-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-perf" + ], + "isolate": "upload_nano_results.isolate", + "priority": 0.8 + }, "Upload-Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": { "dependencies": [ "Perf-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All" @@ -30441,6 +30818,87 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": { + "dependencies": [ + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": { + "dependencies": [ + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, + "Upload-Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": { + "dependencies": [ + "Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All" + ], + "dimensions": [ + "cpu:x86-64-Haswell_GCE", + "gpu:none", + "os:Debian-9.2", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "upload_dm_results", + "repository=<(REPO)", + "buildername=Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_repo=<(PATCH_REPO)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)", + "gs_bucket=skia-infra-gm" + ], + "isolate": "upload_dm_results.isolate", + "priority": 0.8 + }, "Upload-Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": { "dependencies": [ "Test-Mac-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All" |