| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| index 7f431516d79a5cae51feb17c066dc02174edbf3c..d2b004c2c5d1dda1e15cbf49e371cfa9cae1a0fb 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_rel.json
|
| @@ -241,6 +241,7 @@
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "create adb symlink"
|
| },
|
| {
|
| @@ -251,6 +252,7 @@
|
| "[BUILDER_CACHE]/android_rel/src/out/logcat",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -266,6 +268,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -283,6 +286,7 @@
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -303,6 +307,7 @@
|
| "-t",
|
| "Release"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -325,6 +330,7 @@
|
| "-v",
|
| "--overwrite-known-devices-files"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -441,6 +447,7 @@
|
| "--blacklist-file",
|
| "[BUILDER_CACHE]/android_rel/src/out/bad_devices.json"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -454,6 +461,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -471,6 +479,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -488,6 +497,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -505,6 +515,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -522,6 +533,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -539,6 +551,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -556,6 +569,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -573,6 +587,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -590,6 +605,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -607,6 +623,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -624,6 +641,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -641,6 +659,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -658,6 +677,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "PATH": "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_rel/src/build/android:%(PATH)s"
|
| @@ -675,6 +695,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "AppRTCDemoTest"
|
| },
|
| {
|
| @@ -688,6 +709,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "libjingle_peerconnection_android_unittest"
|
| },
|
| {
|
| @@ -700,6 +722,7 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| @@ -711,6 +734,7 @@
|
| "[BUILDER_CACHE]/android_rel/src/out/Release/full_log",
|
| "[BUILDER_CACHE]/android_rel/src/out/logcat"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -731,6 +755,7 @@
|
| "[BUILDER_CACHE]/android_rel/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/android_rel/1337"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_rel/1337@@@"
|
| @@ -744,6 +769,7 @@
|
| "--more-info",
|
| "[BUILDER_CACHE]/android_rel/src/out/Release/full_log"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_rel/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -760,6 +786,7 @@
|
| "--adb-path",
|
| "[BUILDER_CACHE]/android_rel/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_rel/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -774,6 +801,7 @@
|
| "\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",
|
| "[BUILDER_CACHE]/android_rel/src/out/Release/test_logs/*.log"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_rel",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|