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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_and_expiration.json

Issue 1828573003: Add support for swarming priority and expiration in the test spec (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed comments Created 4 years, 9 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_trybot.py ('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_trybot.expected/swarming_test_with_priority_and_expiration.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_and_expiration.json
similarity index 84%
copy from scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
copy to scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_and_expiration.json
index 6100db8fafe777dbfb0635eb05cbf97a1f312d1b..8f8f26093f95af8f46ef9b89bc7d50e7bac2d33d 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_and_expiration.json
@@ -197,24 +197,14 @@
"@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"isolated_scripts\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"--correct-common-arg\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"isolate_name\": \"telemetry_gpu_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"telemetry_gpu_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"non_precommit_args\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"--SHOULD-NOT-BE-PRESENT-DURING-THE-RUN\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"precommit_args\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"--these-args-should-be-present\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"--test-machine-name=\\\"${buildername}\\\"\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"--build-revision=\\\"${got_revision}\\\"\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"expiration\": 7200, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"priority_adjustment\": \"higher\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"gl_tests\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -280,17 +270,21 @@
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_unittests\"@@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests\", @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\"@@@",
"@@@STEP_LOG_LINE@analyze_details@ ]@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
"@@@STEP_LOG_END@analyze_details@@@"
@@ -335,13 +329,13 @@
"--goma-dir",
"[SLAVE_BUILD]/src/build/goma/client",
"--swarming-targets-file",
- "telemetry_gpu_unittests\n",
+ "gl_tests\n",
"//out/Release"
],
"cwd": "[SLAVE_BUILD]",
"name": "generate_build_files (with patch)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@swarming-targets-file.txt@telemetry_gpu_unittests@@@",
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@gl_tests@@@",
"@@@STEP_LOG_END@swarming-targets-file.txt@@@"
]
},
@@ -374,7 +368,8 @@
"--ninja-ensure-up-to-date",
"--",
"chromium_swarm_tests",
- "telemetry_gpu_unittests"
+ "gl_tests",
+ "gl_tests_run"
],
"cwd": "[SLAVE_BUILD]",
"name": "compile (with patch)",
@@ -408,13 +403,13 @@
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_unittests.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
],
"cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests\": \"[dummy hash for telemetry_gpu_unittests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -439,15 +434,15 @@
"--isolate-server",
"https://isolateserver.appspot.com",
"--priority",
- "30",
+ "20",
"--shards",
"1",
"--task-name",
- "telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
+ "gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
- "3600",
+ "7200",
"--io-timeout",
"1200",
"--hard-timeout",
@@ -469,11 +464,11 @@
"--tag",
"buildnumber:571",
"--tag",
- "data:[dummy hash for telemetry_gpu_unittests]",
+ "data:[dummy hash for gl_tests]",
"--tag",
"master:tryserver.chromium.linux",
"--tag",
- "name:telemetry_gpu_unittests",
+ "name:gl_tests",
"--tag",
"os:Ubuntu-12.04",
"--tag",
@@ -489,24 +484,21 @@
"--tag",
"slavename:TestSlavename",
"--tag",
- "stepname:telemetry_gpu_unittests (with patch) on Ubuntu-12.04",
+ "stepname:gl_tests (with patch) on Ubuntu-12.04",
+ "--idempotent",
"--user",
"commit-bot@chromium.org",
- "[dummy hash for telemetry_gpu_unittests]",
+ "[dummy hash for gl_tests]",
"--",
- "--correct-common-arg",
- "--these-args-should-be-present",
- "--test-machine-name=\"linux_chromium_rel_ng\"",
- "--build-revision=\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"",
- "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "[trigger] telemetry_gpu_unittests (with patch) on Ubuntu-12.04",
+ "name": "[trigger] gl_tests (with patch) on Ubuntu-12.04",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/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\"@@@",
@@ -518,10 +510,20 @@
]
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "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",
@@ -529,21 +531,38 @@
"--print-status-updates",
"--shards",
"1",
- "telemetry_gpu_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571",
- "--task-output-dir",
- "/path/to/tmp/"
+ "gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571"
],
"cwd": "[SLAVE_BUILD]",
- "name": "telemetry_gpu_unittests (with patch) on Ubuntu-12.04",
+ "name": "gl_tests (with patch) on Ubuntu-12.04",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@outdir_json@{@@@",
- "@@@STEP_LOG_LINE@outdir_json@ \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
- "@@@STEP_LOG_LINE@outdir_json@ \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
- "@@@STEP_LOG_LINE@outdir_json@}@@@",
- "@@@STEP_LOG_END@outdir_json@@@"
+ "@@@STEP_LINK@shard #0 isolated out@blah@@@"
]
},
{
+ "cmd": [
+ "python",
+ "-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\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
+ "--master-name",
+ "tryserver.chromium.linux",
+ "--builder-name",
+ "linux_chromium_rel_ng",
+ "--build-number",
+ "571",
+ "--test-type",
+ "gl_tests (with patch) on Ubuntu-12.04",
+ "--test-results-server",
+ "test-results.appspot.com",
+ "--chrome-revision",
+ "170242"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "Upload to test-results [gl_tests (with patch) on Ubuntu-12.04]"
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698