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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.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_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
index e998d2b53cb005b36abc02a4acaac3f0fd39c44a..e7b1880d62dd5503776c8fddb1ecdccdc1ec298e 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json
@@ -30,7 +30,6 @@
"src@HEAD",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -104,7 +103,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -119,7 +117,6 @@
"--json-output",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -144,7 +141,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@@@",
@@ -166,7 +162,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",
@@ -192,7 +187,6 @@
"--properties",
"{\"buildername\": \"android_chromium_gn_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -207,7 +201,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@@@",
@@ -239,7 +232,6 @@
"[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read filter exclusion spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
@@ -262,7 +254,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
@@ -318,7 +309,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -331,7 +321,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@@@@",
@@ -356,7 +345,6 @@
"[SLAVE_BUILD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -375,7 +363,6 @@
"[CACHE]/cipd/goma",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -420,7 +407,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"
@@ -437,7 +423,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
@@ -449,7 +434,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -459,7 +443,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"
@@ -475,7 +458,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"
@@ -492,7 +474,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"
@@ -605,7 +586,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"
@@ -630,7 +610,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -644,7 +623,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AndroidWebViewTest (with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -672,7 +650,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest]"
},
{
@@ -686,7 +663,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromePublicTest (with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -714,7 +690,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest]"
},
{
@@ -728,7 +703,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeSyncShellTest (with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -756,7 +730,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest]"
},
{
@@ -770,7 +743,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ContentShellTest (with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -798,7 +770,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest]"
},
{
@@ -812,7 +783,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test MojoTest (with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -840,7 +810,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [MojoTest]"
},
{
@@ -855,7 +824,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"
@@ -874,7 +842,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"
@@ -909,7 +876,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -976,7 +942,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",
@@ -1002,7 +967,6 @@
"[CACHE]/cipd/goma",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -1045,7 +1009,6 @@
"content_shell_test_apk",
"mojo_test_apk"
],
- "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"
@@ -1067,7 +1030,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AndroidWebViewTest (without patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1095,7 +1057,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest] (2)"
},
{
@@ -1109,7 +1070,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromePublicTest (without patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1137,7 +1097,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest] (2)"
},
{
@@ -1151,7 +1110,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeSyncShellTest (without patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1179,7 +1137,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest] (2)"
},
{
@@ -1193,7 +1150,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ContentShellTest (without patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1221,7 +1177,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest] (2)"
},
{
@@ -1235,7 +1190,6 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test MojoTest (without patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1263,7 +1217,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [MojoTest] (2)"
},
{
@@ -1272,7 +1225,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "AndroidWebViewTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1285,7 +1237,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ChromePublicTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1298,7 +1249,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ChromeSyncShellTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1311,7 +1261,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ContentShellTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1324,7 +1273,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "MojoTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1341,7 +1289,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -1353,7 +1300,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -1374,7 +1320,6 @@
"[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/android_chromium_gn_rel/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_chromium_gn_rel/571@@@"
@@ -1388,7 +1333,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",
@@ -1403,7 +1347,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",
@@ -1418,7 +1361,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