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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.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/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
index 06dc9ecf879e382ddc0c367c59ea80fb12fad752..f68169660cdf51785de1044fd3da145975f0edc2 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
@@ -25,7 +25,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -99,7 +98,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -114,7 +112,6 @@
"--json-output",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -139,7 +136,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -161,7 +157,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",
@@ -186,7 +181,6 @@
"--properties",
"{\"buildername\": \"Android Webview L (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -201,7 +195,6 @@
"[SLAVE_BUILD]/src/testing/buildbot/chromium.android.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
@@ -218,7 +211,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -231,7 +223,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@@@@",
@@ -256,7 +247,6 @@
"[SLAVE_BUILD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -266,7 +256,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/src/out/Debug"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -296,7 +285,6 @@
"--build-number",
"571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -308,7 +296,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -318,7 +305,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"
@@ -334,7 +320,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"
@@ -351,7 +336,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"
@@ -465,7 +449,6 @@
"/path/to/tmp/json",
"--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"
@@ -490,7 +473,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -506,7 +488,6 @@
"--additional-apk",
"[SLAVE_BUILD]/src/out/Debug/apks/SystemWebView.apk"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test SystemWebViewShellLayoutTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -534,7 +515,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [SystemWebViewShellLayoutTest]"
},
{
@@ -547,7 +527,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -559,7 +538,6 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -578,7 +556,6 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"gs://chromium-android/logcat_dumps/Android Webview L (dbg)/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Webview L (dbg)/571@@@"
@@ -592,7 +569,6 @@
"--more-info",
"[SLAVE_BUILD]/src/out/Debug/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -607,7 +583,6 @@
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -622,7 +597,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/Debug/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