Chromium Code Reviews| Index: scripts/slave/recipes/blink_trybot.py |
| diff --git a/scripts/slave/recipes/blink_trybot.py b/scripts/slave/recipes/blink_trybot.py |
| index 9e8d6e06a268c2bc06328a972e69447b87733885..1ed8e07ed73fd1ab5d200052cab5e3557186613d 100644 |
| --- a/scripts/slave/recipes/blink_trybot.py |
| +++ b/scripts/slave/recipes/blink_trybot.py |
| @@ -5,7 +5,9 @@ |
| DEPS = [ |
| 'bot_update', |
| 'chromium', |
| + 'chromium_tests', |
| 'gclient', |
| + 'isolate', |
| 'json', |
| 'path', |
| 'platform', |
| @@ -14,6 +16,7 @@ DEPS = [ |
| 'raw_io', |
| 'rietveld', |
| 'step', |
| + 'swarming', |
| 'test_utils', |
| ] |
| @@ -271,10 +274,25 @@ def GenSteps(api): |
| bot_update_step = api.bot_update.ensure_checkout( |
| force=True, patch_root=bot_config.get('root_override')) |
| - api.chromium.runhooks() |
| - api.chromium.compile() |
| + if bot_config['compile_only']: |
| + api.chromium.runhooks() |
| + api.chromium.compile() |
|
Paweł Hajdan Jr.
2014/10/29 14:11:11
Early return here and de-indent everything below.
Sergiy Byelozyorov
2014/10/29 14:43:45
Done.
|
| + else: |
| + api.chromium_tests.configure_swarming('blink') |
| + |
| + # Swarming uses Isolate to transfer files to swarming bots. |
| + # set_isolate_environment modifies GYP_DEFINES to enable test isolation. |
| + api.isolate.set_isolate_environment(api.chromium.c) |
| + |
| + # Ensure swarming_client is compatible with what recipes expect. |
| + api.swarming.check_client_version() |
| + |
| + api.chromium.runhooks() |
| + |
| + api.isolate.clean_isolated_files(api.chromium.output_dir) |
| + api.chromium.compile() |
| + api.isolate.find_isolated_tests(api.chromium.output_dir) |
| - if not bot_config['compile_only']: |
| api.python('webkit_lint', webkit_lint, [ |
| '--build-dir', api.path['checkout'].join('out'), |
| '--target', api.chromium.c.BUILD_CONFIG |
| @@ -317,7 +335,6 @@ def GenSteps(api): |
| "import sys; sys.exit(1)") |
| raise exception |
| - if not bot_config['compile_only']: |
| def deapply_patch_fn(_failing_steps): |
| bot_update_json = bot_update_step.json.output |
| api.gclient.c.revisions['src'] = str( |
| @@ -327,7 +344,9 @@ def GenSteps(api): |
| api.bot_update.ensure_checkout(patch=False, force=True) |
| api.chromium.runhooks() |
| + api.isolate.clean_isolated_files(api.chromium.output_dir) |
| api.chromium.compile() |
| + api.isolate.find_isolated_tests(api.chromium.output_dir) |
| api.test_utils.determine_new_failures( |
| api, [api.chromium.steps.BlinkTest(api)], deapply_patch_fn) |
| @@ -368,7 +387,8 @@ def GenTests(api): |
| for test in tests: |
| test += ( |
| - properties(mastername, buildername) + |
| + properties(mastername, buildername, |
| + blamelist_real=['someone@chromium.org']) + |
| api.platform(bot_config['testing']['platform'], |
| bot_config.get( |
| 'chromium_config_kwargs', {}).get('TARGET_BITS', 64)) |
| @@ -438,3 +458,10 @@ def GenTests(api): |
| api.override_step_data(without_patch, |
| canned_test(passing=True, minimal=True)) |
| ) |
| + |
| + yield ( |
| + api.test('non_cq_tryjob') + |
| + properties('tryserver.blink', 'win_blink_rel', |
| + requester='someone@chromium.org') + |
| + api.step_data(with_patch, canned_test(passing=True)) |
| + ) |