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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.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_linux_Android_GN.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
index dc459170638ab84b9e0b0c0f81b00616c92c6372..338969fa3ca5609e297aec71d7c0f317ea69ba0b 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN.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",
@@ -187,7 +182,6 @@
"--properties",
"{\"buildername\": \"Android GN\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -202,7 +196,6 @@
"[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
@@ -219,7 +212,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -232,7 +224,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@@@@",
@@ -257,7 +248,6 @@
"[SLAVE_BUILD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -276,7 +266,6 @@
"[CACHE]/cipd/goma",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -321,7 +310,6 @@
"mojo_test_apk",
"sandbox_linux_unittests_deps"
],
- "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"
@@ -341,7 +329,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -351,7 +338,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"
@@ -367,7 +353,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"
@@ -384,7 +369,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"
@@ -497,7 +481,6 @@
"--output-device-blacklist",
"/path/to/tmp/json"
],
- "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"
@@ -522,7 +505,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -536,7 +518,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AndroidWebViewTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -564,7 +545,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest]"
},
{
@@ -578,7 +558,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromePublicTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -606,7 +585,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest]"
},
{
@@ -620,7 +598,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeSyncShellTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -648,7 +625,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest]"
},
{
@@ -662,7 +638,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ContentShellTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -690,7 +665,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest]"
},
{
@@ -704,7 +678,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test MojoTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -732,7 +705,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [MojoTest]"
},
{
@@ -747,7 +719,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "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"
@@ -766,7 +737,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "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"
@@ -783,7 +753,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -795,7 +764,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -814,7 +782,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/Android GN/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android GN/571@@@"
@@ -828,7 +795,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",
@@ -843,7 +809,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",
@@ -858,7 +823,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