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

Side by Side Diff: scripts/slave/recipes/chromium_trybot.py

Issue 1185693002: Move builders.py and steps.py to chromium_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add builders property to chromium_tests test_api. 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from infra.libs.infra_types import freeze 5 from infra.libs.infra_types import freeze
6 6
7 DEPS = [ 7 DEPS = [
8 'bot_update', 8 'bot_update',
9 'chromium', 9 'chromium',
10 'chromium_android', 10 'chromium_android',
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 349
350 350
351 def _GenStepsInternal(api): 351 def _GenStepsInternal(api):
352 def get_bot_config(mastername, buildername): 352 def get_bot_config(mastername, buildername):
353 master_dict = BUILDERS.get(mastername, {}) 353 master_dict = BUILDERS.get(mastername, {})
354 return master_dict.get('builders', {}).get(buildername) 354 return master_dict.get('builders', {}).get(buildername)
355 355
356 mastername = api.properties.get('mastername') 356 mastername = api.properties.get('mastername')
357 buildername = api.properties.get('buildername') 357 buildername = api.properties.get('buildername')
358 bot_config = get_bot_config(mastername, buildername) 358 bot_config = get_bot_config(mastername, buildername)
359 api.chromium_tests.load_builder_configs(bot_config['mastername'])
359 api.chromium_tests.configure_swarming('chromium', precommit=True) 360 api.chromium_tests.configure_swarming('chromium', precommit=True)
360 361
361 # TODO(sergiyb): This is a temporary hack to run GPU tests on tryserver 362 # TODO(sergiyb): This is a temporary hack to run GPU tests on tryserver
362 # only. This should be removed when we will convert chromium.gpu waterfall 363 # only. This should be removed when we will convert chromium.gpu waterfall
363 # to swarming and be able to replicate the tests to tryserver automatically. 364 # to swarming and be able to replicate the tests to tryserver automatically.
364 master = api.properties['mastername'] 365 master = api.properties['mastername']
365 builder = api.properties['buildername'] 366 builder = api.properties['buildername']
366 enable_gpu_tests = builder in CHROMIUM_GPU_DIMENSION_SETS.get(master, {}) 367 enable_gpu_tests = builder in CHROMIUM_GPU_DIMENSION_SETS.get(master, {})
367 368
368 api.chromium_tests.configure_build( 369 api.chromium_tests.configure_build(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 bot_update_step.presentation.properties['got_revision'], 405 bot_update_step.presentation.properties['got_revision'],
405 bot_update_step.presentation.properties['got_webkit_revision'], 406 bot_update_step.presentation.properties['got_webkit_revision'],
406 enable_swarming=True, 407 enable_swarming=True,
407 swarming_dimension_sets=CHROMIUM_GPU_DIMENSION_SETS[master][builder])) 408 swarming_dimension_sets=CHROMIUM_GPU_DIMENSION_SETS[master][builder]))
408 409
409 # TODO(phajdan.jr): Remove special case for layout tests. 410 # TODO(phajdan.jr): Remove special case for layout tests.
410 # This could be done by moving layout tests to main waterfall. 411 # This could be done by moving layout tests to main waterfall.
411 affected_files = api.tryserver.get_files_affected_by_patch() 412 affected_files = api.tryserver.get_files_affected_by_patch()
412 if (any([f.startswith('third_party/WebKit') for f in affected_files]) and 413 if (any([f.startswith('third_party/WebKit') for f in affected_files]) and
413 buildername in CHROMIUM_BLINK_TESTS_BUILDERS): 414 buildername in CHROMIUM_BLINK_TESTS_BUILDERS):
414 tests.append(api.chromium.steps.BlinkTest()) 415 tests.append(api.chromium_tests.steps.BlinkTest())
415 416
416 compile_targets, tests_including_triggered = \ 417 compile_targets, tests_including_triggered = \
417 api.chromium_tests.get_compile_targets_and_tests( 418 api.chromium_tests.get_compile_targets_and_tests(
418 bot_config['mastername'], 419 bot_config['mastername'],
419 bot_config['buildername'], 420 bot_config['buildername'],
420 master_dict, 421 master_dict,
421 override_bot_type='builder_tester', 422 override_bot_type='builder_tester',
422 override_tests=tests) 423 override_tests=tests)
423 424
424 requires_compile, matching_exes, compile_targets = \ 425 requires_compile, matching_exes, compile_targets = \
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 990
990 yield ( 991 yield (
991 api.test('swarming_paths') + 992 api.test('swarming_paths') +
992 api.properties.tryserver( 993 api.properties.tryserver(
993 mastername='tryserver.chromium.linux', 994 mastername='tryserver.chromium.linux',
994 buildername='linux_chromium_rel_ng', 995 buildername='linux_chromium_rel_ng',
995 path_config='swarming', 996 path_config='swarming',
996 ) + 997 ) +
997 api.platform.name('linux') 998 api.platform.name('linux')
998 ) 999 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698