| Index: scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus9_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus9_.json b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus9_.json
|
| index afa925c20dcfc0b812e765ddde04c90f79b01627..8efa62c0de5ad1d91babd863cf146d6486024b36 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus9_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Android_Tests__dbg___L_Nexus9_.json
|
| @@ -325,6 +325,10 @@
|
| "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| "/path/to/tmp/json"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "List adb devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -341,6 +345,10 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -364,6 +372,10 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -540,6 +552,10 @@
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -572,6 +588,10 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -583,6 +603,10 @@
|
| "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -601,6 +625,10 @@
|
| "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/Android Tests (dbg) (L Nexus9)/571"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests (dbg) (L Nexus9)/571@@@"
|
| @@ -642,6 +670,10 @@
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
|
| ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|