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

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json

Issue 1930433002: Roll recipe dependencies (nontrivial). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rebase Created 4 years, 8 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/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json
index 8abca15310e066e5c23fbc38e3558a7f585ca21c..5f48d9c6b8dbe4a787e2a47fef20904e014c672a 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_nexus5_perf_bisect.json
@@ -30,7 +30,6 @@
"src@HEAD",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -112,7 +111,6 @@
"[SLAVE_BUILD]/src/out/build_product.zip",
"[SLAVE_BUILD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -154,7 +152,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -164,7 +161,6 @@
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -180,7 +176,6 @@
"--adb-path",
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -197,7 +192,6 @@
"--known-devices-file",
"[BUILD]/site_config/.known_devices"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -317,7 +311,6 @@
"350",
"--remove-system-webview"
],
- "cwd": "[SLAVE_BUILD]",
"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"
@@ -342,7 +335,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -352,7 +344,6 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
@@ -372,7 +363,6 @@
"--output_json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "load config",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -390,7 +380,6 @@
"-u",
"import sys; sys.exit(1)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Recipe failed. Reason: Could not load config file. Double check your changes to config files for syntax errors.",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import sys; sys.exit(1)@@@",
@@ -407,7 +396,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -419,7 +407,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -440,7 +427,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/android_nexus5_perf_bisect/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_nexus5_perf_bisect/571@@@"
@@ -454,7 +440,6 @@
"--more-info",
"[SLAVE_BUILD]/src/out/Release/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -469,7 +454,6 @@
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -484,7 +468,6 @@
"\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"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698