| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
|
| index 4954f9d290f80cc7a67f6364cc5743c051acfc7a..618cba663354a3502d7648768ef05d6d705a7ca1 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Asan_Builder_Tests__dbg_.json
|
| @@ -266,6 +266,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"
|
| },
|
| {
|
| @@ -442,6 +446,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"
|
| },
|
| {
|
| @@ -456,6 +464,10 @@
|
| "--json-results-file",
|
| "/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": "Instrumentation test AndroidWebViewTest",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -483,6 +495,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "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": "Upload to test-results [AndroidWebViewTest]"
|
| },
|
| {
|
| @@ -497,6 +513,10 @@
|
| "--json-results-file",
|
| "/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": "Instrumentation test ChromePublicTest",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -524,6 +544,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "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": "Upload to test-results [ChromePublicTest]"
|
| },
|
| {
|
| @@ -538,6 +562,10 @@
|
| "--json-results-file",
|
| "/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": "Instrumentation test ContentShellTest",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -565,6 +593,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "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": "Upload to test-results [ContentShellTest]"
|
| },
|
| {
|
| @@ -579,6 +611,10 @@
|
| "--json-results-file",
|
| "/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": "Instrumentation test ChromeSyncShellTest",
|
| "~followup_annotations": [
|
| "step returned non-zero exit code: 1",
|
| @@ -606,6 +642,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "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": "Upload to test-results [ChromeSyncShellTest]"
|
| },
|
| {
|
| @@ -618,6 +658,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"
|
| },
|
| {
|
| @@ -629,6 +673,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"
|
| },
|
| {
|
| @@ -647,6 +695,10 @@
|
| "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/Android Asan Builder Tests (dbg)/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 Asan Builder Tests (dbg)/571@@@"
|
| @@ -701,6 +753,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@@@@",
|
|
|