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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.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: updated baselines 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
« scripts/slave/recipes/chromium.expected/buildnumber_zero.json ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_XP.json » ('j') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.json
index 2fcafe152843231543a4d84ab39665266105f0fa..727b51f0a928bec8c5bc2b62b26ab445cbdb3b05 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan__dbg_.json
@@ -152,6 +152,27 @@
"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\\cleanup_temp.py"
],
"cwd": "[SLAVE_BUILD]",
@@ -233,27 +254,6 @@
"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"
@@ -265,17 +265,76 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
- "browser_tests"
+ "[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/WebKit Win Oilpan (dbg)/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:WebKit Win Oilpan (dbg)",
+ "--tag",
+ "buildnumber:571",
+ "--tag",
+ "data:[dummy hash for browser_tests]",
+ "--tag",
+ "master:chromium.webkit",
+ "--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": "[error] browser_tests",
+ "name": "[trigger] 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@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Windows-7-SP1/[dummy has/WebKit Win Oilpan (dbg)/571\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Windows-7-SP1/[dummy has/WebKit Win Oilpan (dbg)/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@@@"
]
},
{
@@ -346,21 +405,29 @@
]
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
- "browser_tests"
+ "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/WebKit Win Oilpan (dbg)/571"
],
"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@@@"
- ]
+ "name": "browser_tests"
},
{
"cmd": [
« scripts/slave/recipes/chromium.expected/buildnumber_zero.json ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Win_Oilpan.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_XP.json » ('j') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_Aura.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698