Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(850)

Unified Diff: scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json

Issue 2014373002: chromium_tests: apply chromium.get_env() when running tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json
diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json
index 0954336c94ad43967ae317e12e9ee842e4368037..962a9c207473786c3304725ccb96d278624774f8 100644
--- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.json
+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_collect_failure.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": [
@@ -1814,6 +1954,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@{@@@",
@@ -1867,7 +2011,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": [
@@ -1882,6 +2028,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@{@@@",
@@ -1933,7 +2083,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": [
@@ -1948,6 +2100,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@{@@@",
@@ -1999,7 +2155,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": [
@@ -2014,6 +2172,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@{@@@",
@@ -2065,7 +2227,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": [
@@ -2080,6 +2244,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@{@@@",
@@ -2133,7 +2301,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": [
@@ -2148,6 +2318,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@{@@@",
@@ -2201,7 +2375,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": [
@@ -2216,6 +2392,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@{@@@",
@@ -2267,7 +2447,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": [
@@ -2282,6 +2464,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@{@@@",
@@ -2333,7 +2519,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": [
@@ -2350,6 +2538,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"
},
{
@@ -2361,6 +2553,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"
},
{
@@ -2379,6 +2575,10 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/Android Tests (amp split)/77457"
],
+ "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)/77457@@@"
@@ -2420,6 +2620,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@@@@",

Powered by Google App Engine
This is Rietveld 408576698