From 9c4dfadabd1edabbd49e760edf4f067a2b03dd6f Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 19 Jul 2018 15:58:15 -0400 Subject: Remove an internal bot. Bug: skia:7046 No-Try: true Change-Id: Ie7883c3ea93166432bcb502667b0de7af586722a Reviewed-on: https://skia-review.googlesource.com/142587 Reviewed-by: Eric Boren Commit-Queue: Ben Wagner --- .../bots/recipes/test.expected/internal_bot_1.json | 909 --------------------- infra/bots/recipes/test.py | 33 - 2 files changed, 942 deletions(-) delete mode 100644 infra/bots/recipes/test.expected/internal_bot_1.json (limited to 'infra') diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json deleted file mode 100644 index 1939189515..0000000000 --- a/infra/bots/recipes/test.expected/internal_bot_1.json +++ /dev/null @@ -1,909 +0,0 @@ -[ - { - "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", - "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": [ - "/opt/infra-android/tools/adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/resources" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skia/resources", - "/sdcard/revenge_of_the_skiabot/resources" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "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 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": [ - "/opt/infra-android/tools/adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/skps" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skp", - "/sdcard/revenge_of_the_skiabot/skps" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/tmp/SKP_VERSION", - "/sdcard/revenge_of_the_skiabot/SKP_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/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 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": [ - "/opt/infra-android/tools/adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/images" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/images" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/skimage", - "/sdcard/revenge_of_the_skiabot/images" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/tmp/SK_IMAGE_VERSION", - "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/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 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": [ - "/opt/infra-android/tools/adb", - "shell", - "cat", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION", - "stdout": "/path/to/tmp/" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n", - "[START_DIR]/svg", - "/sdcard/revenge_of_the_skiabot/svgs" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@", - "@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@", - "@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@", - "@@@STEP_LOG_LINE@python.inline@ continue@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@", - "@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', 'push',@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@", - "@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/tmp/SVG_VERSION", - "/sdcard/revenge_of_the_skiabot/SVG_VERSION" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", - "/sdcard/revenge_of_the_skiabot/dm_out" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "shell", - "mkdir", - "-p", - "/sdcard/revenge_of_the_skiabot/dm_out" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "mkdir /sdcard/revenge_of_the_skiabot/dm_out" - }, - { - "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": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "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": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/tmp/uninteresting_hashes.txt", - "/sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push [START_DIR]/tmp/uninteresting_hashes.txt /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt" - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" - ], - "name": "get swarming bot id (2)", - "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": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/build/dm", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push dm" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "set -x; /data/local/tmp/dm --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android buildbucket_build_id 123454321 swarming_bot_id \"\" swarming_task_id \"\" --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --dont_write pdf --nocpu --config gles glesdft glessrgb --src tests gm image colorImage svg --blacklist _ svg _ svgparse_ glessrgb image _ _ _ test _ GrShape _ test _ EGLImageTest _ test _ ES2BlendWithNoTexture _ test _ GrSurfaceRenderability _ test _ WritePixelsMSAA_Gpu _ test _ WritePixelsNonTextureMSAA_Gpu _ test _ WritePixelsNonTexture_Gpu _ test _ WritePixels_Gpu _ 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 ~skbug6653 --nonativeFonts --verbose; echo $? >/data/local/tmp/rc", - "[START_DIR]/tmp/dm.sh" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "write dm.sh" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "push", - "[START_DIR]/tmp/dm.sh", - "/data/local/tmp/" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "push dm.sh" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "logcat", - "-c" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "clear log" - }, - { - "cmd": [ - "python", - "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n", - "/data/local/tmp/", - "dm.sh" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "dm", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", - "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", - "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [], - "name": "adb pull" - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "pull", - "/sdcard/revenge_of_the_skiabot/dm_out", - "[TMP_BASE]/adb_pull_tmp_1" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "glob", - "[TMP_BASE]/adb_pull_tmp_1", - "dm_out/*" - ], - "infra_step": true, - "name": "adb pull.list pulled files", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/1.png@@@", - "@@@STEP_LOG_LINE@glob@[TMP_BASE]/adb_pull_tmp_1/2.png@@@", - "@@@STEP_LOG_END@glob@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[TMP_BASE]/adb_pull_tmp_1/1.png", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "adb pull.copy 1.png", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[TMP_BASE]/adb_pull_tmp_1/2.png", - "[START_DIR]/[SWARM_OUT_DIR]" - ], - "infra_step": true, - "name": "adb pull.copy 2.png", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[TMP_BASE]/adb_pull_tmp_1" - ], - "infra_step": true, - "name": "adb pull.rmtree [TMP_BASE]/adb_pull_tmp_1", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n", - "[START_DIR]/build" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "dump log", - "timeout": 300, - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", - "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", - "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", - "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", - "@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@", - "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", - "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", - "@@@STEP_LOG_LINE@python.inline@ print line@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "/opt/infra-android/tools/adb", - "kill-server" - ], - "cwd": "[START_DIR]/skia", - "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "kill adb server" - }, - { - "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 edbbe34b20..92b74a1194 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -446,16 +446,6 @@ def dm_flags(api, bot): # Android and iOS. skia:5438 blacklist('_ test _ GrShape') - if api.vars.internal_hardware_label == '1': - # skia:7046 - blacklist('_ test _ EGLImageTest') - blacklist('_ test _ ES2BlendWithNoTexture') - blacklist('_ test _ GrSurfaceRenderability') - blacklist('_ test _ WritePixelsMSAA_Gpu') - blacklist('_ test _ WritePixelsNonTextureMSAA_Gpu') - blacklist('_ test _ WritePixelsNonTexture_Gpu') - blacklist('_ test _ WritePixels_Gpu') - if api.vars.internal_hardware_label == '2': # skia:7160 blacklist('_ test _ SRGBReadWritePixels') @@ -817,9 +807,6 @@ def dm_flags(api, bot): # skia:7603 match.append('~^GrMeshTest$') - if api.vars.internal_hardware_label == '1': - match.append('~skbug6653') # skia:6653 - if blacklisted: args.append('--blacklist') args.extend(blacklisted) @@ -1239,26 +1226,6 @@ def GenTests(api): api.step_data(retry_step_name + ' (attempt 3)', retcode=1) ) - yield ( - api.test('internal_bot_1') + - api.properties(buildername=builder, - buildbucket_build_id='123454321', - revision='abc123', - path_config='kitchen', - swarm_out_dir='[SWARM_OUT_DIR]', - internal_hardware_label='1') + - api.path.exists( - api.path['start_dir'].join('skia'), - api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', - 'skimage', 'VERSION'), - api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', - 'skp', 'VERSION'), - api.path['start_dir'].join('skia', 'infra', 'bots', 'assets', - 'svg', 'VERSION'), - api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt') - ) - ) - yield ( api.test('internal_bot_2') + api.properties(buildername=builder, -- cgit v1.2.3