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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1187773004: Add swarming support for MB (and the GN bots) in the chromium recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: fixes 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_fyi_CrWinClang64_dbg_.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_ng.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..a1d1b8ecdfcb7d298df19290678fbca26305e68a 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@@@"
]
},
@@ -154,6 +159,40 @@
"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",
+ "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 +205,124 @@
"--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",
+ "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",
+ "[BUILD]\\scripts\\slave\\chromium\\run_crash_handler.py",
+ "--target",
+ "Debug"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "start_crash_service"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
+ "browser_tests"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[error] browser_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
+ "browser_tests"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "[collect error] browser_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "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_fyi_CrWinClang64_dbg_.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win8_chromium_ng.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698