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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json

Issue 2207263002: Add logcats link in builbot page for android swarming tasks (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix mismatch links on task_id Created 4 years, 4 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
« no previous file with comments | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_no_output_trigger_test.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json
similarity index 71%
copy from scripts/slave/recipes/chromium.expected/dynamic_junit_test.json
copy to scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json
index de88cda7534b838e730756812a512457834afeea..9cd2967449c56a63d7a6b2b38e2103e06c4c1830 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_junit_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json
@@ -223,9 +223,44 @@
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Android Tests\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"junit_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"base_junit_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"override_compile_targets\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"chrome_public_test_apk\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"override_isolate_target\": \"chrome_public_test_apk\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"cipd_packages\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"cipd_package\": \"logdog/butler/linux-386\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"location\": \"bin\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"git_revision:deadbeef\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"cipd_package\": \"some/other/package\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"location\": \"bin\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"git_revision:deadbeef\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dimension_sets\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"build.id\": \"KTU84P\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"hammerhead\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"output_links\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"link\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"https://luci-logdog.appspot.com/v/?s\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"=android%2Fswarming%2Flogcats%2F\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"${TASK_ID}%2F%2B%2Funified_logcats\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"shard_index:${SHARD_INDEX}logcats\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"chrome_public_test_apk\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -328,6 +363,30 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+ "--build-dir",
+ "[SLAVE_BUILD]/src/out/Release",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "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"
+ },
+ "name": "find isolated tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[build::adb]/resources/list_devices.py",
"['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
@@ -374,27 +433,123 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "junit",
- "-s",
- "base_junit_tests",
- "--verbose",
- "--release",
- "--json-results-file",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "trigger",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--priority",
+ "25",
+ "--shards",
+ "1",
+ "--task-name",
+ "chrome_public_test_apk/Android/cccccccccc/Android Tests/571",
+ "--dump-json",
"/path/to/tmp/json",
- "--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "android_devices",
+ "6",
+ "--dimension",
+ "build.id",
+ "KTU84P",
+ "--dimension",
+ "os",
+ "Android",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--dimension",
+ "product.board",
+ "hammerhead",
+ "--tag",
+ "buildername:Android Tests",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:cccccccccccccccccc",
+ "--tag",
+ "master:chromium.linux",
+ "--tag",
+ "name:chrome_public_test_apk",
+ "--tag",
+ "os:Android",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "slavename:TestSlavename",
+ "--tag",
+ "stepname:chrome_public_test_apk on Android",
+ "--idempotent",
+ "--cipd-package",
+ "bin:logdog/butler/linux-386:git_revision:deadbeef",
+ "--cipd-package",
+ "bin:some/other/package:git_revision:deadbeef",
+ "cccccccccccccccccc",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "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"
+ },
+ "name": "[trigger] chrome_public_test_apk on Android",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "python",
+ "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
+ "--swarming-client-dir",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
+ "--temp-root-dir",
+ "[TMP_BASE]",
+ "--merged-test-output",
+ "/path/to/tmp/json",
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--json",
+ "{\"base_task_name\": \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\", \"tasks\": {\"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"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"
},
- "name": "base_junit_tests",
+ "name": "chrome_public_test_apk on Android",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
- "@@@STEP_FAILURE@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@",
+ "@@@STEP_LINK@shard_index:0logcats@https://luci-logdog.appspot.com/v/?s=android%2Fswarming%2Flogcats%2F10001%2F%2B%2Funified_logcats@@@"
]
},
{
@@ -403,7 +558,7 @@
"-u",
"RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
"--input-gtest-json",
- "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
+ "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
"--master-name",
"chromium.linux",
"--builder-name",
@@ -411,17 +566,17 @@
"--build-number",
"571",
"--test-type",
- "base_junit_tests",
+ "chrome_public_test_apk on Android",
"--test-results-server",
"test-results.appspot.com",
"--chrome-revision",
- "refs/heads/master@{#170242}"
+ "170242"
],
"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"
},
- "name": "Upload to test-results [base_junit_tests]"
+ "name": "Upload to test-results [chrome_public_test_apk on Android]"
},
{
"cmd": [
@@ -448,8 +603,7 @@
},
{
"name": "$result",
- "reason": "1 tests failed: ['base_junit_tests']",
"recipe_result": null,
- "status_code": 1
+ "status_code": 0
}
]
« no previous file with comments | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_no_output_trigger_test.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698