diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-05-17 14:35:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-17 19:28:43 +0000 |
| commit | 7673f3ba9ec50a3ffcb19c2817980cc0a2ab7b3a (patch) | |
| tree | 8941a69f9778b857e6bcc13b0aae5fa35887c4bd /infra/bots/recipe_modules | |
| parent | 8c29c14f54984e7848fc860571a7521889e6f012 (diff) | |
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 <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
16 files changed, 361 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 7029ec28f0..ea9d04a09b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -552,6 +571,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -581,6 +601,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -595,6 +616,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -635,6 +657,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -681,6 +704,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 9058f6d600..8770bfb046 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -930,6 +949,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -959,6 +979,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -973,6 +994,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -1013,6 +1035,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -1059,6 +1082,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json index 8e6404caac..e9fd132d04 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -784,6 +803,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -813,6 +833,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -827,6 +848,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -867,6 +889,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -913,6 +936,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json index ea736f63c7..a7c1c85514 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -768,6 +787,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -797,6 +817,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -811,6 +832,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -851,6 +873,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -897,6 +920,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index f315066bd3..c0a8d7eb7b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -594,6 +613,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -623,6 +643,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -637,6 +658,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -677,6 +699,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -723,6 +746,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 018b07fa07..55c6e4b88a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -552,6 +571,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -581,6 +601,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -595,6 +616,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -635,6 +657,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -681,6 +704,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index eb5be8f1aa..0f119fb67e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -836,6 +855,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -865,6 +885,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -879,6 +900,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -919,6 +941,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -965,6 +988,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index 67cdf5c3f4..8de4a9ea8f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -231,6 +235,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -248,6 +253,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -264,6 +270,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -280,6 +287,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -328,6 +336,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -371,6 +380,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -388,6 +398,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -404,6 +415,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -420,6 +432,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -468,6 +481,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -511,6 +525,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -528,6 +543,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -544,6 +560,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -560,6 +577,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -608,6 +626,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -907,6 +926,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -936,6 +956,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -950,6 +971,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -990,6 +1012,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -1036,6 +1059,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json index 5f81728344..5883e52e57 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -594,6 +613,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -623,6 +643,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -637,6 +658,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -677,6 +699,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -723,6 +746,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json index f35338fdf7..2400389fbb 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -736,6 +755,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -765,6 +785,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -779,6 +800,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -819,6 +841,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -865,6 +888,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json index c112b2f597..c7697b24fb 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -860,6 +879,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -889,6 +909,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -903,6 +924,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -943,6 +965,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -989,6 +1012,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index b2f8850bbf..ba4f93a013 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -317,6 +327,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -333,6 +344,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -349,6 +361,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +410,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -440,6 +454,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -457,6 +472,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -473,6 +489,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -489,6 +506,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +555,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -784,6 +803,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -813,6 +833,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -827,6 +848,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -867,6 +889,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -943,6 +966,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index 40837cca07..da69edb04e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -160,6 +164,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -177,6 +182,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -193,6 +199,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -209,6 +216,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +265,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -300,6 +309,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -318,6 +328,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -332,6 +343,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -348,6 +360,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -365,6 +378,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -381,6 +395,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +412,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -445,6 +461,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -488,6 +505,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -505,6 +523,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -521,6 +540,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +557,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -585,6 +606,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -832,6 +854,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -861,6 +884,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -875,6 +899,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -915,6 +940,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -961,6 +987,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index e792470483..59839990ba 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -101,6 +105,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -115,6 +120,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -132,6 +138,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -208,6 +215,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -225,6 +233,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -241,6 +250,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -257,6 +267,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -305,6 +316,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -348,6 +360,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -365,6 +378,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -381,6 +395,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -397,6 +412,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -445,6 +461,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -488,6 +505,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -505,6 +523,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -521,6 +540,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -537,6 +557,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -585,6 +606,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -832,6 +854,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -861,6 +884,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -875,6 +899,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -915,6 +940,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -961,6 +987,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json index 3de05327a6..dc884dd724 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json @@ -8,6 +8,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -52,6 +53,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -68,6 +70,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -84,6 +87,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -101,6 +105,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -115,6 +120,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -132,6 +138,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -149,6 +156,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -163,6 +171,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -180,6 +189,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, @@ -258,6 +268,7 @@ ], "cwd": "[START_DIR]/skia", "env": { + "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index f327b4d6d4..3f83c6d226 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -15,9 +15,12 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): super(GNAndroidFlavorUtils, self).__init__(m) self._ever_ran_adb = False self.ADB_BINARY = '/usr/bin/adb.1.0.35' + self.ADB_PUB_KEY = '/home/chrome-bot/.android/adbkey' self._golo_devices = ['Nexus5x'] if self.m.vars.builder_cfg.get('model') in self._golo_devices: self.ADB_BINARY = '/opt/infra-android/tools/adb' + self.ADB_PUB_KEY = ('/home/chrome-bot/.android/' + 'chrome_infrastructure_adbkey') self.device_dirs = default_flavor.DeviceDirs( dm_dir = self.m.vars.android_data_dir + 'dm_out', @@ -97,10 +100,11 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): fail_build_on_failure=False) with self.m.context(cwd=self.m.vars.skia_dir): - return self.m.run.with_retry(self.m.step, title, attempts, - cmd=[self.ADB_BINARY]+list(cmd), - between_attempts_fn=wait_for_device, - **kwargs) + with self.m.env({'ADB_VENDOR_KEYS': self.ADB_PUB_KEY}): + return self.m.run.with_retry(self.m.step, title, attempts, + cmd=[self.ADB_BINARY]+list(cmd), + between_attempts_fn=wait_for_device, + **kwargs) def _scale_for_dm(self): device = self.m.vars.builder_cfg.get('model') |