Chromium Code Reviews| Index: scripts/slave/recipes/chromium_trybot.py |
| diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py |
| index 5861131f6b02fd208e4dab6a103191044a0a6ae6..399aa88d4faf8b041b74aa2465af15f2dc496374 100644 |
| --- a/scripts/slave/recipes/chromium_trybot.py |
| +++ b/scripts/slave/recipes/chromium_trybot.py |
| @@ -606,19 +606,6 @@ def find_test_named(test_name, tests): |
| return [test for test in tests if test.name == test_name] |
| -def build_to_priority(build_properties): |
| - """Returns the Swarming task priority for the build. |
| - |
| - Does this by determining the build type. Lower is higher priority. |
| - """ |
| - requester = build_properties.get('requester') |
| - if requester == 'commit-bot@chromium.org': |
| - # Commit queue job. |
| - return 30 |
| - # Normal try job. |
| - return 50 |
| - |
| - |
| def GenSteps(api): |
| def swarming_shards_from_test_spec(test_spec, test_name): |
| if isinstance(test_spec, dict): |
| @@ -908,22 +895,7 @@ def GenSteps(api): |
| mastername = api.properties.get('mastername') |
| buildername = api.properties.get('buildername') |
| bot_config = get_bot_config(mastername, buildername) |
| - api.swarming.set_default_dimension('pool', 'Chrome') |
| - api.swarming.default_priority = build_to_priority(api.properties) |
| - api.swarming.add_default_tag('project:chromium') |
| - api.swarming.add_default_tag('purpose:pre-commit') |
| - api.swarming.default_idempotent = True |
| - |
| - # Differentiate between try jobs and CQ jobs. Always find out who made the CL. |
| - requestor = api.properties.get('requestor') |
| - if requestor == 'commit-bot@chromium.org': |
| - api.swarming.add_default_tag('purpose:CQ') |
| - blamelist = api.properties.get('blamelist') |
| - if len(blamelist) == 1: |
| - requestor = blamelist[0] |
| - else: |
| - api.swarming.add_default_tag('purpose:ManualTS') |
| - api.swarming.default_user = requestor |
| + api.chromium_tests.configure_swarming('chromium', precommit=True) |
| # TODO(phajdan): uncomment once we have XP or 10.6 trybots. |
|
M-A Ruel
2014/10/29 18:11:01
Remove 900-903 while at it. It's stale.
Sergiy Byelozyorov
2014/10/29 20:04:24
Done.
|
| #os_dimension = bot_config.get('swarming_dimensions', {}).get('os') |
| @@ -1198,12 +1170,8 @@ def GenTests(api): |
| yield ( |
| api.test('arm') + |
| - api.properties.generic( |
| - mastername='tryserver.chromium.linux', |
| - buildername='linux_arm', |
| - requestor='commit-bot@chromium.org', |
| - blamelist='joe@chromium.org', |
| - blamelist_real=['joe@chromium.org']) + |
| + props(buildername='linux_arm', requester='commit-bot@chromium.org', |
| + blamelist='joe@chromium.org', blamelist_real=['joe@chromium.org']) + |
| api.platform('linux', 64) + |
| api.override_step_data('read test spec', api.json.output({ |
| 'compile_targets': ['browser_tests_run'], |
| @@ -1277,7 +1245,8 @@ def GenTests(api): |
| # commit queue job. |
| yield ( |
| api.test('swarming_basic_cq') + |
| - props(buildername='linux_chromium_rel') + |
| + props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org', |
| + blamelist_real=['joe@chromium.org']) + |
| api.platform.name('linux') + |
| api.override_step_data('read test spec', api.json.output({ |
| 'gtest_tests': [ |
| @@ -1350,7 +1319,8 @@ def GenTests(api): |
| # One target (browser_tests) failed to produce *.isolated file. |
| yield ( |
| api.test('swarming_missing_isolated') + |
| - props(buildername='linux_chromium_rel') + |
| + props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org', |
| + blamelist_real=['joe@chromium.org']) + |
| api.platform.name('linux') + |
| api.override_step_data('read test spec', api.json.output({ |
| 'gtest_tests': [ |
| @@ -1382,7 +1352,8 @@ def GenTests(api): |
| # deapplied patch. |
| yield ( |
| api.test('swarming_deapply_patch') + |
| - props(buildername='linux_chromium_rel') + |
| + props(requester='commit-bot@chromium.org', blamelist='joe@chromium.org', |
| + blamelist_real=['joe@chromium.org']) + |
| api.platform.name('linux') + |
| api.override_step_data('read test spec', api.json.output({ |
| 'gtest_tests': [ |