| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Set of utilities to add commands to a buildbot factory. | 5 """Set of utilities to add commands to a buildbot factory. |
| 6 | 6 |
| 7 Contains the Native Client specific commands. Based on commands.py""" | 7 Contains the Native Client specific commands. Based on commands.py""" |
| 8 | 8 |
| 9 import logging | 9 import logging |
| 10 | 10 |
| 11 from buildbot.steps import trigger | 11 from buildbot.steps import trigger |
| 12 from buildbot.steps.transfer import FileUpload | 12 from buildbot.steps.transfer import FileUpload |
| 13 from buildbot.process.properties import WithProperties | 13 from buildbot.process.properties import WithProperties |
| 14 | 14 |
| 15 from master import chromium_step | 15 from master import chromium_step |
| 16 from master.factory import commands | 16 from master.factory import commands |
| 17 from master.log_parser import process_log | 17 from master.log_parser import process_log |
| 18 | 18 |
| 19 import config | |
| 20 | |
| 21 | 19 |
| 22 class NativeClientCommands(commands.FactoryCommands): | 20 class NativeClientCommands(commands.FactoryCommands): |
| 23 """Encapsulates methods to add nacl commands to a buildbot factory.""" | 21 """Encapsulates methods to add nacl commands to a buildbot factory.""" |
| 24 | 22 |
| 25 # pylint: disable=W0212 | |
| 26 # (accessing protected member _NaClBase) | |
| 27 PERF_BASE_URL = config.Master._NaClBase.perf_base_url | |
| 28 | |
| 29 def __init__(self, factory=None, build_dir=None, target_platform=None): | 23 def __init__(self, factory=None, build_dir=None, target_platform=None): |
| 30 commands.FactoryCommands.__init__(self, factory, 'Release', build_dir, | 24 commands.FactoryCommands.__init__(self, factory, 'Release', build_dir, |
| 31 target_platform) | 25 target_platform) |
| 32 | 26 |
| 33 def AddTrigger(self, trigger_who): | 27 def AddTrigger(self, trigger_who): |
| 34 self._factory.addStep(trigger.Trigger( | 28 self._factory.addStep(trigger.Trigger( |
| 35 schedulerNames=[trigger_who], | 29 schedulerNames=[trigger_who], |
| 36 updateSourceStamp=False, | 30 updateSourceStamp=False, |
| 37 waitForFinish=True, | 31 waitForFinish=True, |
| 38 set_properties={ | 32 set_properties={ |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if usePython: | 87 if usePython: |
| 94 command = [self._python] + command | 88 command = [self._python] + command |
| 95 self._factory.addStep(test_class, | 89 self._factory.addStep(test_class, |
| 96 name='annotate', | 90 name='annotate', |
| 97 description='annotate', | 91 description='annotate', |
| 98 timeout=timeout, | 92 timeout=timeout, |
| 99 haltOnFailure=haltOnFailure, | 93 haltOnFailure=haltOnFailure, |
| 100 env=env, | 94 env=env, |
| 101 workdir=workdir, | 95 workdir=workdir, |
| 102 command=command) | 96 command=command) |
| OLD | NEW |