587afc9df0
The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
600 lines
14 KiB
JSON
600 lines
14 KiB
JSON
[
|
|
{
|
|
"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": "Release_x64",
|
|
"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/Release_x64/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-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
|
|
"issue",
|
|
"456789",
|
|
"patchset",
|
|
"12",
|
|
"patch_storage",
|
|
"gerrit",
|
|
"swarming_bot_id",
|
|
"",
|
|
"swarming_task_id",
|
|
"",
|
|
"--svgs",
|
|
"[START_DIR]/svg",
|
|
"--key",
|
|
"arch",
|
|
"x86_64",
|
|
"compiler",
|
|
"MSVC",
|
|
"configuration",
|
|
"Release",
|
|
"cpu_or_gpu",
|
|
"CPU",
|
|
"cpu_or_gpu_value",
|
|
"AVX2",
|
|
"model",
|
|
"GCE",
|
|
"os",
|
|
"Win2k8",
|
|
"--uninterestingHashesFile",
|
|
"[START_DIR]/tmp/uninteresting_hashes.txt",
|
|
"--writePath",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/dm",
|
|
"--dont_write",
|
|
"pdf",
|
|
"--randomProcessorTest",
|
|
"--nogpu",
|
|
"--config",
|
|
"8888",
|
|
"srgb",
|
|
"pdf",
|
|
"565",
|
|
"f16",
|
|
"sp-8888",
|
|
"2ndpic-8888",
|
|
"lite-8888",
|
|
"gbr-8888",
|
|
"serialize-8888",
|
|
"tiles_rt-8888",
|
|
"pic-8888",
|
|
"--src",
|
|
"tests",
|
|
"gm",
|
|
"image",
|
|
"colorImage",
|
|
"--blacklist",
|
|
"f16",
|
|
"_",
|
|
"_",
|
|
"dstreadshuffle",
|
|
"gbr-8888",
|
|
"image",
|
|
"_",
|
|
"_",
|
|
"gbr-8888",
|
|
"colorImage",
|
|
"_",
|
|
"_",
|
|
"_",
|
|
"image",
|
|
"gen_platf",
|
|
"pal8os2v2.bmp",
|
|
"_",
|
|
"image",
|
|
"gen_platf",
|
|
"pal8os2v2-16.bmp",
|
|
"_",
|
|
"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",
|
|
"_",
|
|
"gm",
|
|
"_",
|
|
"composeshader_bitmap",
|
|
"_",
|
|
"image",
|
|
"gen_platf",
|
|
"testimgari.jpg",
|
|
"_",
|
|
"image",
|
|
"gen_platf",
|
|
"rle8-height-negative.bmp",
|
|
"_",
|
|
"image",
|
|
"gen_platf",
|
|
"rle4-height-negative.bmp",
|
|
"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",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"makecolorspace",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"bleed_alpha_image",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"bleed_alpha_image_shader",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"verylargebitmap",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"verylarge_picture_image",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"drawfilter",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"drawfilter",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"drawfilter",
|
|
"lite-8888",
|
|
"gm",
|
|
"_",
|
|
"drawfilter",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-picture",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-picture",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-picture",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-picture",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-raster",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-raster",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-raster",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-raster",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-ctable",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-ctable",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-ctable",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"image-cacherator-from-ctable",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"gamut",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"gamut",
|
|
"lite-8888",
|
|
"gm",
|
|
"_",
|
|
"gamut",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"gamut",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"gamut",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"lite-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"sp-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"pic-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"lite-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"2ndpic-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"serialize-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"tiles_rt-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_bw",
|
|
"tiles_rt-8888",
|
|
"gm",
|
|
"_",
|
|
"complexclip4_aa",
|
|
"--verbose"
|
|
],
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"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
|
|
}
|
|
] |