| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| index 8525e5590d6eefc60e96dd06b5b38fe0122023be..2405175f5705abe515922c73bc48f34c368753dd 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
|
| @@ -303,6 +303,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@[@@@",
|
| @@ -319,6 +323,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@@@@",
|
| @@ -342,6 +350,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"
|
| },
|
| {
|
| @@ -518,6 +530,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"
|
| },
|
| {
|
| @@ -532,6 +548,10 @@
|
| "gs://chrome-amp-keys/commit_queue_pool/api_key",
|
| "[BUILD]/site_config/.amp_commit_queue_pool_key"
|
| ],
|
| + "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 download amp api key"
|
| },
|
| {
|
| @@ -546,6 +566,10 @@
|
| "gs://chrome-amp-keys/commit_queue_pool/api_secret",
|
| "[BUILD]/site_config/.amp_commit_queue_pool_secret"
|
| ],
|
| + "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 download amp api secret"
|
| },
|
| {
|
| @@ -581,7 +605,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] android_webview_unittests",
|
| "~followup_annotations": [
|
| @@ -609,6 +635,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save android_webview_unittests"
|
| },
|
| {
|
| @@ -646,7 +676,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] base_unittests",
|
| "~followup_annotations": [
|
| @@ -674,6 +706,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save base_unittests"
|
| },
|
| {
|
| @@ -711,7 +747,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] components_unittests",
|
| "~followup_annotations": [
|
| @@ -739,6 +777,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save components_unittests"
|
| },
|
| {
|
| @@ -774,7 +816,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] events_unittests",
|
| "~followup_annotations": [
|
| @@ -802,6 +846,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save events_unittests"
|
| },
|
| {
|
| @@ -837,7 +885,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] gl_tests",
|
| "~followup_annotations": [
|
| @@ -865,6 +915,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save gl_tests"
|
| },
|
| {
|
| @@ -900,7 +954,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] ipc_tests",
|
| "~followup_annotations": [
|
| @@ -928,6 +984,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save ipc_tests"
|
| },
|
| {
|
| @@ -965,7 +1025,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] sql_unittests",
|
| "~followup_annotations": [
|
| @@ -993,6 +1055,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save sql_unittests"
|
| },
|
| {
|
| @@ -1030,7 +1096,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] sync_unit_tests",
|
| "~followup_annotations": [
|
| @@ -1058,6 +1126,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save sync_unit_tests"
|
| },
|
| {
|
| @@ -1093,7 +1165,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] ui_android_unittests",
|
| "~followup_annotations": [
|
| @@ -1121,6 +1195,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save ui_android_unittests"
|
| },
|
| {
|
| @@ -1156,7 +1234,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[trigger] ui_touch_selection_unittests",
|
| "~followup_annotations": [
|
| @@ -1184,6 +1264,10 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.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": "[trigger] save ui_touch_selection_unittests"
|
| },
|
| {
|
| @@ -1197,6 +1281,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",
|
| @@ -1224,6 +1312,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]"
|
| },
|
| {
|
| @@ -1237,6 +1329,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",
|
| @@ -1264,6 +1360,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]"
|
| },
|
| {
|
| @@ -1277,6 +1377,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",
|
| @@ -1304,6 +1408,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]"
|
| },
|
| {
|
| @@ -1317,6 +1425,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",
|
| @@ -1344,6 +1456,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]"
|
| },
|
| {
|
| @@ -1574,6 +1690,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 [junit_unit_tests]"
|
| },
|
| {
|
| @@ -1621,6 +1741,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 [chrome_junit_tests]"
|
| },
|
| {
|
| @@ -1668,6 +1792,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 [content_junit_tests]"
|
| },
|
| {
|
| @@ -1678,6 +1806,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load android_webview_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1729,7 +1861,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] android_webview_unittests",
|
| "~followup_annotations": [
|
| @@ -1744,6 +1878,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load base_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1797,7 +1935,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] base_unittests",
|
| "~followup_annotations": [
|
| @@ -1812,6 +1952,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load components_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1865,7 +2009,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] components_unittests",
|
| "~followup_annotations": [
|
| @@ -1880,6 +2026,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load events_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1931,7 +2081,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] events_unittests",
|
| "~followup_annotations": [
|
| @@ -1946,6 +2098,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load gl_tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1997,7 +2153,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] gl_tests",
|
| "~followup_annotations": [
|
| @@ -2012,6 +2170,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load ipc_tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -2063,7 +2225,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] ipc_tests",
|
| "~followup_annotations": [
|
| @@ -2078,6 +2242,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load sql_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -2131,7 +2299,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] sql_unittests",
|
| "~followup_annotations": [
|
| @@ -2146,6 +2316,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load sync_unit_tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -2199,7 +2373,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] sync_unit_tests",
|
| "~followup_annotations": [
|
| @@ -2214,6 +2390,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load ui_android_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -2265,7 +2445,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] ui_android_unittests",
|
| "~followup_annotations": [
|
| @@ -2280,6 +2462,10 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/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": "[collect] load ui_touch_selection_unittests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -2331,7 +2517,9 @@
|
| "--release"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "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": "[collect] ui_touch_selection_unittests",
|
| "~followup_annotations": [
|
| @@ -2348,6 +2536,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"
|
| },
|
| {
|
| @@ -2359,6 +2551,10 @@
|
| "[SLAVE_BUILD]/src/out/Release/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"
|
| },
|
| {
|
| @@ -2377,6 +2573,10 @@
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/Android Tests (amp split)/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 (amp split)/571@@@"
|
| @@ -2418,6 +2618,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/Release/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@@@@",
|
|
|