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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.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/full_chromium_webkit_WebKit_Android__Nexus4_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
index ce5edd88406a0c0bfd203ee89e0696d2cb11283c..c3aa84ba4f841af26b6397a6ef028c2a90ba2751 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Android__Nexus4_.json
@@ -307,6 +307,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@[@@@",
@@ -323,6 +327,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@@@@",
@@ -346,6 +354,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"
},
{
@@ -522,6 +534,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"
},
{
@@ -599,6 +615,10 @@
"--platform",
"android"
],
+ "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": "webkit_tests",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
@@ -622,6 +642,10 @@
"--gs-acl",
"public-read"
],
+ "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": "archive_webkit_tests_results",
"~followup_annotations": [
"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Android__Nexus4_/571/layout-test-results/results.html@@@",
@@ -638,6 +662,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"
},
{
@@ -649,6 +677,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"
},
{
@@ -667,6 +699,10 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/WebKit Android (Nexus4)/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/WebKit Android (Nexus4)/571@@@"
@@ -708,6 +744,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