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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.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_Swarm_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
index d817242d20fbf9bf4744c27942fab12c84dcc827..e535863a0a744a7d9f693daa8d598385438bd558 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.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 @@
"[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -175,7 +170,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",
@@ -200,7 +194,6 @@
"--properties",
"{\"buildername\": \"Android Swarm Builder\", \"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@{}@@@",
@@ -215,7 +208,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@@@",
@@ -243,7 +235,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -256,7 +247,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@@@@",
@@ -281,7 +271,6 @@
"[SLAVE_BUILD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -293,7 +282,6 @@
"[SLAVE_BUILD]/src/out/Release",
"--clean-isolated-files"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
@@ -314,7 +302,6 @@
"browser_tests_apk\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -357,7 +344,6 @@
"--",
"browser_tests_apk_run"
],
- "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"
@@ -395,7 +381,6 @@
"--verbose",
"[SLAVE_BUILD]/src/out/Release/browser_tests_apk.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -414,7 +399,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -432,7 +416,6 @@
"\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests_apk"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -449,7 +432,6 @@
"\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -466,7 +448,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