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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1527123002: Support swarming dimensions in src-side JSON buildbot files. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback from maruel. Created 5 years 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
« scripts/slave/recipes/chromium.py ('K') | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win7_Tests__1_.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json
similarity index 58%
copy from scripts/slave/recipes/chromium.expected/full_chromium_win_Win7_Tests__1_.json
copy to scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json
index dbb2e65b69afc15551bc0f9911ad85c400f3dbb3..fc47e5e71b7909e30a96bd793f547fa492525d0e 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win7_Tests__1_.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_gpu.json
@@ -28,7 +28,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@1111111",
+ "src@HEAD",
"--output_manifest"
],
"cwd": "[SLAVE_BUILD]",
@@ -138,12 +138,27 @@
"@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Win7 Tests (1)\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"isolated_scripts\": [@@@",
"@@@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@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dimension_sets\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gpu\": \"10de:104a\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Windows\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gpu\": \"1002:6779\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Windows\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gpu\": \"15ad:0405\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Windows\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -209,8 +224,10 @@
"[BUILD]\\scripts\\slave\\extract_build.py",
"--target",
"Release",
- "--build-archive-url",
- "gs://test-domain/test-archive.zip",
+ "--build-url",
+ "gs://chromium-win-archive/chromium.win/Win Builder/full-build-win32.zip",
+ "--build_revision",
+ "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--master-name",
"chromium.win",
"--build-number",
@@ -266,7 +283,7 @@
"--shards",
"1",
"--task-name",
- "browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571",
+ "telemetry_gpu_unittests on NVIDIA GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -280,10 +297,10 @@
"x86-64",
"--dimension",
"gpu",
- "none",
+ "10de:104a",
"--dimension",
"os",
- "Windows-7-SP1",
+ "Windows",
"--dimension",
"pool",
"Chrome",
@@ -292,13 +309,13 @@
"--tag",
"buildnumber:571",
"--tag",
- "data:ffffffffffffffffffffffffffffffffffffffff",
+ "data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
"--tag",
"master:chromium.win",
"--tag",
- "name:browser_tests",
+ "name:telemetry_gpu_unittests on NVIDIA GPU on Windows",
"--tag",
- "os:Windows-7-SP1",
+ "os:Windows",
"--tag",
"project:chromium",
"--tag",
@@ -306,19 +323,172 @@
"--tag",
"purpose:post-commit",
"--tag",
- "stepname:browser_tests",
- "--idempotent",
- "ffffffffffffffffffffffffffffffffffffffff",
+ "stepname:telemetry_gpu_unittests on NVIDIA GPU on Windows on Windows",
+ "eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
"--",
- "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
],
"cwd": "[SLAVE_BUILD]",
- "name": "[trigger] browser_tests",
+ "name": "[trigger] telemetry_gpu_unittests on NVIDIA GPU on Windows on Windows",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests on NVIDIA GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests on NVIDIA GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[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",
+ "telemetry_gpu_unittests on ATI GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "1002:6779",
+ "--dimension",
+ "os",
+ "Windows",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win7 Tests (1)",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--tag",
+ "master:chromium.win",
+ "--tag",
+ "name:telemetry_gpu_unittests on ATI GPU on Windows",
+ "--tag",
+ "os:Windows",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "stepname:telemetry_gpu_unittests on ATI GPU on Windows on Windows",
+ "eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--",
+ "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[trigger] telemetry_gpu_unittests on ATI GPU on Windows on Windows",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests on ATI GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests on ATI GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[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",
+ "telemetry_gpu_unittests on (15ad) GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "15ad:0405",
+ "--dimension",
+ "os",
+ "Windows",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win7 Tests (1)",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--tag",
+ "master:chromium.win",
+ "--tag",
+ "name:telemetry_gpu_unittests on (15ad) GPU on Windows",
+ "--tag",
+ "os:Windows",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--tag",
+ "stepname:telemetry_gpu_unittests on (15ad) GPU on Windows on Windows",
+ "eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+ "--",
+ "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[trigger] telemetry_gpu_unittests on (15ad) GPU on Windows on Windows",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"telemetry_gpu_unittests on (15ad) GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"telemetry_gpu_unittests on (15ad) GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/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\"@@@",
@@ -348,18 +518,10 @@
"name": "test_installer"
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[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",
- "--",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -367,33 +529,71 @@
"--print-status-updates",
"--shards",
"1",
- "browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571"
+ "telemetry_gpu_unittests on NVIDIA GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
+ "--task-output-dir",
+ "/path/to/tmp/"
],
"cwd": "[SLAVE_BUILD]",
- "name": "browser_tests"
+ "name": "telemetry_gpu_unittests on NVIDIA GPU on Windows on Windows",
+ "~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@@@"
+ ]
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[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\"}]}]}",
- "--master-name",
- "chromium.win",
- "--builder-name",
- "Win7 Tests (1)",
- "--build-number",
- "571",
- "--test-type",
- "browser_tests",
- "--test-results-server",
- "test-results.appspot.com",
- "--chrome-revision",
- "170242"
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "telemetry_gpu_unittests on ATI GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
+ "--task-output-dir",
+ "/path/to/tmp/"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "telemetry_gpu_unittests on ATI GPU on Windows on Windows",
+ "~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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "telemetry_gpu_unittests on (15ad) GPU on Windows/Windows/eeeeeeeeee/Win7 Tests (1)/571",
+ "--task-output-dir",
+ "/path/to/tmp/"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Upload to test-results [browser_tests]"
+ "name": "telemetry_gpu_unittests on (15ad) GPU on Windows on Windows",
+ "~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@@@"
+ ]
},
{
"cmd": [
« scripts/slave/recipes/chromium.py ('K') | « scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_mac_gpu.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698