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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1177593002: Add swarming support for MB (and the GN bots) in the chromium recipes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge patchset #3 to r295696 (no other changes) Created 5 years, 6 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/full_chromium_win_Win7_Tests__dbg__1_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__1_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json
index b8173a560325f735dcd1a7030310855569a4af84..a51bfda152b198473d105cd18ce75e2f7b533cf7 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json
@@ -74,34 +74,28 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS]\\gclient.py",
- "runhooks"
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "--version"
],
"cwd": "[SLAVE_BUILD]",
- "env": {
- "GYP_CHROMIUM_NO_ACTION": "1"
- },
- "name": "gclient runhooks"
+ "name": "swarming.py --version",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@0.4.10@@@"
+ ]
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
- "gen",
- "-v",
- "-m",
- "chromium.win",
- "-b",
- "Win8 Aura",
- "--config-file",
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
- "--goma-dir",
- "[BUILD]\\goma",
- "//out/Debug"
+ "[DEPOT_TOOLS]\\gclient.py",
+ "runhooks"
],
"cwd": "[SLAVE_BUILD]",
- "name": "generate_build_files"
+ "env": {
+ "GYP_CHROMIUM_NO_ACTION": "1"
+ },
+ "name": "gclient runhooks"
},
{
"cmd": [
@@ -115,7 +109,18 @@
"name": "read test spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"Win8 Aura\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
+ "@@@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@ \"test\": \"browser_tests\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -145,6 +150,49 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[SLAVE_BUILD]\\src\\out\\Debug",
+ "--output-json",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "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",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
+ "gen",
+ "-v",
+ "-m",
+ "chromium.win",
+ "-b",
+ "Win8 Aura",
+ "--config-file",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
+ "--goma-dir",
+ "[BUILD]\\goma",
+ "--swarming-targets-file",
+ "browser_tests\n",
+ "//out/Debug"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "generate_build_files"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILD]\\scripts\\slave\\cleanup_temp.py"
],
"cwd": "[SLAVE_BUILD]",
@@ -154,6 +202,18 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[isolate]\\resources\\find_isolated_tests.py",
+ "--build-dir",
+ "[SLAVE_BUILD]\\src\\out\\Debug",
+ "--clean-isolated-files"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "clean isolated files"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILD]\\scripts\\slave\\compile.py",
"--target",
"Debug",
@@ -166,10 +226,170 @@
"--goma-dir",
"[BUILD]\\goma",
"--",
- "All",
- "chromium_builder_tests"
+ "browser_tests",
+ "browser_tests_run",
+ "crash_service"
],
"cwd": "[SLAVE_BUILD]",
"name": "compile"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[isolate]\\resources\\remove_build_metadata.py",
+ "--build-dir",
+ "[SLAVE_BUILD]\\src\\out\\Debug",
+ "--src-dir",
+ "[SLAVE_BUILD]\\src"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "remove_build_metadata"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[isolate]\\resources\\isolate.py",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client",
+ "batcharchive",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--isolate-server",
+ "https://isolateserver.appspot.com",
+ "--verbose",
+ "[SLAVE_BUILD]\\src\\out\\Debug\\browser_tests.isolated.gen.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "isolate tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests\": \"[dummy hash for browser_tests]\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]\\scripts\\slave\\chromium\\run_crash_handler.py",
+ "--target",
+ "Debug"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "start_crash_service"
+ },
+ {
+ "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",
+ "browser_tests/Windows-7-SP1/[dummy has/Win8 Aura/571",
+ "--dump-json",
+ "/path/to/tmp/json",
+ "--expiration",
+ "3600",
+ "--io-timeout",
+ "1200",
+ "--hard-timeout",
+ "3600",
+ "--dimension",
+ "cpu",
+ "x86-64",
+ "--dimension",
+ "gpu",
+ "none",
+ "--dimension",
+ "os",
+ "Windows-7-SP1",
+ "--dimension",
+ "pool",
+ "Chrome",
+ "--tag",
+ "buildername:Win8 Aura",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:[dummy hash for browser_tests]",
+ "--tag",
+ "master:chromium.win",
+ "--tag",
+ "name:browser_tests",
+ "--tag",
+ "os:Windows-7-SP1",
+ "--tag",
+ "project:chromium",
+ "--tag",
+ "purpose:CI",
+ "--tag",
+ "purpose:post-commit",
+ "--idempotent",
+ "[dummy hash for browser_tests]",
+ "--",
+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[trigger] browser_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/[dummy has/Win8 Aura/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/[dummy has/Win8 Aura/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_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",
+ "--",
+ "collect",
+ "--swarming",
+ "https://chromium-swarm.appspot.com",
+ "--decorate",
+ "--print-status-updates",
+ "--shards",
+ "1",
+ "browser_tests/Windows-7-SP1/[dummy has/Win8 Aura/571"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "browser_tests"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]\\scripts\\slave\\process_dumps.py",
+ "--target",
+ "Debug"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "process_dumps"
}
]
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_win_Win7_Tests__dbg__1_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__1_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698