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

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_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
Index: scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_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_non_gpu.json
similarity index 86%
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_non_gpu.json
index dbb2e65b69afc15551bc0f9911ad85c400f3dbb3..fa7fa5b2fb5049356d7922d8471dc265030e4d49 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_non_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,18 @@
"@@@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@ \"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 +215,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 +274,7 @@
"--shards",
"1",
"--task-name",
- "browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571",
+ "telemetry_gpu_unittests/Windows/eeeeeeeeee/Win7 Tests (1)/571",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -283,7 +291,7 @@
"none",
"--dimension",
"os",
- "Windows-7-SP1",
+ "Windows",
"--dimension",
"pool",
"Chrome",
@@ -292,13 +300,13 @@
"--tag",
"buildnumber:571",
"--tag",
- "data:ffffffffffffffffffffffffffffffffffffffff",
+ "data:eeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
"--tag",
"master:chromium.win",
"--tag",
- "name:browser_tests",
+ "name:telemetry_gpu_unittests",
"--tag",
- "os:Windows-7-SP1",
+ "os:Windows",
"--tag",
"project:chromium",
"--tag",
@@ -306,19 +314,18 @@
"--tag",
"purpose:post-commit",
"--tag",
- "stepname:browser_tests",
- "--idempotent",
- "ffffffffffffffffffffffffffffffffffffffff",
+ "stepname:telemetry_gpu_unittests 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 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/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/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 +355,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 +366,19 @@
"--print-status-updates",
"--shards",
"1",
- "browser_tests/Windows-7-SP1/ffffffffff/Win7 Tests (1)/571"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "browser_tests"
- },
- {
- "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"
+ "telemetry_gpu_unittests/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 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": [

Powered by Google App Engine
This is Rietveld 408576698