From 51b5921d45c1095ce5aa6e4791a385b8300173c5 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Mon, 10 Apr 2017 12:57:37 -0400 Subject: Remove GeForce 320M bots Bug: skia: Change-Id: I3ae75d4edde1b3c8cc44413db74e5ab9789a9020 Reviewed-on: https://skia-review.googlesource.com/13065 Reviewed-by: Brian Salomon Commit-Queue: Eric Boren --- infra/bots/gpu_map.json | 1 - infra/bots/jobs.json | 4 - ...ng-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json | 662 --------------------- infra/bots/recipes/test.py | 6 - infra/bots/tasks.json | 286 --------- 5 files changed, 959 deletions(-) delete mode 100644 infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json (limited to 'infra') diff --git a/infra/bots/gpu_map.json b/infra/bots/gpu_map.json index 6028933c1a..392675bf31 100644 --- a/infra/bots/gpu_map.json +++ b/infra/bots/gpu_map.json @@ -1,6 +1,5 @@ { "AMDHD7770": "1002:683d", - "GeForce320M": "10de:08a4", "GT610": "10de:104a", "GTX1070": "10de:1ba1", "GTX550Ti": "10de:1244", diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index f8b135ca8f..b468c0d58e 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -116,8 +116,6 @@ "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release", "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug", "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release", - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug", "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release", "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug", @@ -234,8 +232,6 @@ "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan", "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug", "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release", - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug", "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release", "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json deleted file mode 100644 index 8db28c0b66..0000000000 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ /dev/null @@ -1,662 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "infra_step": true, - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "infra_step": true, - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "infra_step": true, - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[build::file]/resources/fileutil.py", - "rmtree", - "[CUSTOM_[SWARM_OUT_DIR]]/dm" - ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, - "infra_step": true, - "name": "rmtree dm" - }, - { - "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]]/dm", - "511" - ], - "infra_step": true, - "name": "makedirs dm", - "~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 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", - "[START_DIR]/tmp", - "511" - ], - "infra_step": true, - "name": "makedirs 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 contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\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)s: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://gold.skia.org/_/hashes'@@@", - "@@@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", - "--undefok", - "--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-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "swarming_bot_id", - "", - "swarming_task_id", - "", - "--svgs", - "[START_DIR]/svg", - "--key", - "arch", - "x86_64", - "compiler", - "Clang", - "configuration", - "Debug", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "GeForce320M", - "model", - "MacMini4.1", - "os", - "Mac", - "--uninterestingHashesFile", - "[START_DIR]/tmp/uninteresting_hashes.txt", - "--writePath", - "[CUSTOM_[SWARM_OUT_DIR]]/dm", - "--nocpu", - "--randomProcessorTest", - "--config", - "8888", - "srgb", - "pdf", - "gl", - "gldft", - "glsrgb", - "glmsaa8", - "serialize-8888", - "tiles_rt-8888", - "pic-8888", - "--src", - "tests", - "gm", - "image", - "colorImage", - "svg", - "--blacklist", - "glsrgb", - "image", - "_", - "_", - "8888", - "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", - "serialize-8888", - "gm", - "_", - "bleed_image", - "serialize-8888", - "gm", - "_", - "c_gms", - "serialize-8888", - "gm", - "_", - "colortype", - "serialize-8888", - "gm", - "_", - "colortype_xfermodes", - "serialize-8888", - "gm", - "_", - "drawfilter", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds_0.75_0", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds_1_-0.25", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds", - "serialize-8888", - "gm", - "_", - "fontmgr_match", - "serialize-8888", - "gm", - "_", - "fontmgr_iter", - "serialize-8888", - "gm", - "_", - "imagemasksubset", - "serialize-8888", - "gm", - "_", - "bitmapfilters", - "serialize-8888", - "gm", - "_", - "bitmapshaders", - "serialize-8888", - "gm", - "_", - "bleed", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp_shader", - "serialize-8888", - "gm", - "_", - "convex_poly_clip", - "serialize-8888", - "gm", - "_", - "extractalpha", - "serialize-8888", - "gm", - "_", - "filterbitmap_checkerboard_32_32_g8", - "serialize-8888", - "gm", - "_", - "filterbitmap_image_mandrill_64", - "serialize-8888", - "gm", - "_", - "shadows", - "serialize-8888", - "gm", - "_", - "simpleaaclip_aaclip", - "serialize-8888", - "gm", - "_", - "composeshader_bitmap", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes_npot", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes", - "serialize-8888", - "gm", - "_", - "typefacerendering_pfaMac", - "serialize-8888", - "gm", - "_", - "parsedpaths", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_rect", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_shader", - "serialize-8888", - "gm", - "_", - "shadow_utils", - "pic-8888", - "gm", - "_", - "drawfilter", - "pic-8888", - "gm", - "_", - "image-cacherator-from-picture", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-picture", - "pic-8888", - "gm", - "_", - "image-cacherator-from-raster", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-raster", - "pic-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "pic-8888", - "gm", - "_", - "gamut", - "serialize-8888", - "gm", - "_", - "gamut", - "pic-8888", - "gm", - "_", - "complexclip4_bw", - "serialize-8888", - "gm", - "_", - "complexclip4_bw", - "pic-8888", - "gm", - "_", - "complexclip4_aa", - "serialize-8888", - "gm", - "_", - "complexclip4_aa", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_bw", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_aa", - "_", - "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", - "_", - "image", - "_", - "abnormal.wbmp", - "glmsaa8", - "gm", - "_", - "blurcircles" - ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s: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 36575aa750..4acf2ae843 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -338,11 +338,6 @@ def dm_flags(bot): for raw_ext in r: blacklist('_ image _ .%s' % raw_ext) - # Large image that overwhelms older Mac bots - if 'MacMini4.1-GPU' in bot: - blacklist('_ image _ abnormal.wbmp') - blacklist([gl_prefix + 'msaa' + sample_count, 'gm', '_', 'blurcircles']) - if 'IntelHD405' in bot and 'Ubuntu16' in bot: # skia:6331 blacklist(['glmsaa8', 'image', 'gen_codec_gpu', 'abnormal.wbmp']) @@ -721,7 +716,6 @@ TEST_BUILDERS = [ 'GN_Android_Vulkan'), 'Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android', 'Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug', - 'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug', 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug', 'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug', diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 88fe275ce1..813251fa18 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -704,18 +704,6 @@ "Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release" ] }, - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": { - "priority": 0.8, - "tasks": [ - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug" - ] - }, - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release" - ] - }, "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -1412,18 +1400,6 @@ "Upload-Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release" ] }, - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug" - ] - }, - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release" - ] - }, "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -5847,98 +5823,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:23" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:45" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:5" - } - ], - "dependencies": [ - "Build-Mac-Clang-x86_64-Debug", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:08a4", - "os:Mac-10.11", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:23" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:45" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:5" - } - ], - "dependencies": [ - "Build-Mac-Clang-x86_64-Release", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:08a4", - "os:Mac-10.11", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini6.2-CPU-AVX-x86_64-Debug": { "cipd_packages": [ { @@ -11370,98 +11254,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:23" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:45" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:5" - } - ], - "dependencies": [ - "Build-Mac-Clang-x86_64-Debug", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:08a4", - "os:Mac-10.11", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:23" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:45" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:5" - } - ], - "dependencies": [ - "Build-Mac-Clang-x86_64-Release", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:08a4", - "os:Mac-10.11", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini6.2-CPU-AVX-x86_64-Debug": { "cipd_packages": [ { @@ -15826,32 +15618,6 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, - "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "dependencies": [ - "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_nano_results", - "repository=<(REPO)", - "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini6.2-CPU-AVX-x86_64-Release": { "dependencies": [ "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release" @@ -17750,58 +17516,6 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": { - "dependencies": [ - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini4.1-GPU-GeForce320M-x86_64-Release": { - "dependencies": [ - "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-MacMini6.2-CPU-AVX-x86_64-Debug": { "dependencies": [ "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug" -- cgit v1.2.3