| 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..a8f45df88d0fbde5ef9611090ae06ac53419f933 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')
|
|
|
| # TODO(phajdan): uncomment once we have XP or 10.6 trybots.
|
| #os_dimension = bot_config.get('swarming_dimensions', {}).get('os')
|
|
|