From 7673f3ba9ec50a3ffcb19c2817980cc0a2ab7b3a Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 17 May 2018 14:35:43 -0400 Subject: Specify the ADB keys to use for ADB In the golo, specifically, the adb keys used by swarming are different than those used in the docker instance, unless configured otherwise. This means swarming can think a device is ready (authorized) but the adb we called was not (authorized) BUG: 843284 Change-Id: I697d5075258a176e7fc7a4b51a9e2c926e1b8fd0 Reviewed-on: https://skia-review.googlesource.com/128930 Reviewed-by: Eric Boren Commit-Queue: Kevin Lubick --- ...GPU-PowerVR-x86-Release-All-Android_Vulkan.json | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json') diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json index 6979bf22c2..8a9825f369 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json @@ -24,6 +24,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -100,6 +101,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -117,6 +119,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -133,6 +136,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -149,6 +153,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -197,6 +202,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -240,6 +246,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +264,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -273,6 +281,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -289,6 +298,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -337,6 +347,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -380,6 +391,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +409,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -413,6 +426,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -429,6 +443,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -477,6 +492,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -521,6 +537,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +554,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -599,6 +617,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -726,6 +745,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -759,6 +779,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -773,6 +794,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -817,6 +839,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -863,6 +886,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, -- cgit v1.2.3