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

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.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_coverage.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
index a186e03bf46271fc8c139782db59c244bab072cf..2c423d3f851eefa30f09fff35b5f4c1d61764ec9 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.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",
@@ -191,7 +186,6 @@
"--properties",
"{\"buildername\": \"android_coverage\", \"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@{}@@@",
@@ -206,7 +200,6 @@
"[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
@@ -238,7 +231,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'@@@",
@@ -261,7 +253,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
@@ -305,7 +296,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -318,7 +308,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@@@@",
@@ -343,7 +332,6 @@
"[SLAVE_BUILD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -362,7 +350,6 @@
"[CACHE]/cipd/goma",
"//out/Debug"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -404,7 +391,6 @@
"chrome_sync_shell_test_apk",
"content_shell_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"
@@ -421,7 +407,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
@@ -432,7 +417,6 @@
"['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "List adb devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -449,7 +433,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -473,7 +456,6 @@
"[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
@@ -483,7 +465,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"
@@ -499,7 +480,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"
@@ -516,7 +496,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"
@@ -629,7 +608,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"
@@ -654,7 +632,6 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -670,7 +647,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",
@@ -698,7 +674,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest]"
},
{
@@ -714,7 +689,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",
@@ -742,7 +716,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest]"
},
{
@@ -758,7 +731,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",
@@ -786,7 +758,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest]"
},
{
@@ -802,7 +773,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",
@@ -830,7 +800,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest]"
},
{
@@ -846,7 +815,6 @@
"--output",
"[SLAVE_BUILD]/src/out/Debug/coverage/coverage_html/index.html"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Generate coverage report"
},
{
@@ -870,7 +838,6 @@
"fake/file1.java",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Finding lines changed in added file fake/file1.java"
},
{
@@ -881,7 +848,6 @@
"fake/file2.java;",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Finding lines changed in added file fake/file2.java;"
},
{
@@ -892,7 +858,6 @@
"fake/file3.java",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Finding lines changed in added file fake/file3.java"
},
{
@@ -952,7 +917,6 @@
"{\"fake/file1.java\": [], \"fake/file2.java;\": [], \"fake/file3.java\": []}",
"[TMP_BASE]/coverage_tmp_1/file_changes.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Saving changed lines for revision."
},
{
@@ -1034,7 +998,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -1101,7 +1064,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",
@@ -1127,7 +1089,6 @@
"[CACHE]/cipd/goma",
"//out/Debug"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -1169,7 +1130,6 @@
"chrome_sync_shell_test_apk",
"content_shell_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"
@@ -1193,7 +1153,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",
@@ -1221,7 +1180,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest] (2)"
},
{
@@ -1237,7 +1195,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",
@@ -1265,7 +1222,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest] (2)"
},
{
@@ -1281,7 +1237,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",
@@ -1309,7 +1264,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest] (2)"
},
{
@@ -1325,7 +1279,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",
@@ -1353,7 +1306,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest] (2)"
},
{
@@ -1362,7 +1314,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "AndroidWebViewTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1375,7 +1326,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ChromePublicTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1388,7 +1338,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ContentShellTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1401,7 +1350,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ChromeSyncShellTest (retry summary)",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>ignored:<br/>Test.Two<br/>@@@",
@@ -1418,7 +1366,6 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
@@ -1430,7 +1377,6 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"[SLAVE_BUILD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -1451,7 +1397,6 @@
"[SLAVE_BUILD]/src/out/Debug/full_log",
"gs://chromium-android/logcat_dumps/android_coverage/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_coverage/571@@@"
@@ -1465,7 +1410,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",
@@ -1480,7 +1424,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",
@@ -1495,7 +1438,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