| OLD | NEW |
| 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 import cgi | 5 import cgi |
| 6 import re | 6 import re |
| 7 | 7 |
| 8 from recipe_engine import recipe_api | 8 from recipe_engine import recipe_api |
| 9 | 9 |
| 10 | 10 |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 continue | 163 continue |
| 164 if loaded: | 164 if loaded: |
| 165 loaded.insert(0, '') | 165 loaded.insert(0, '') |
| 166 result.presentation.step_text += '<br/>'.join(loaded) | 166 result.presentation.step_text += '<br/>'.join(loaded) |
| 167 | 167 |
| 168 def gclient_config(self): | 168 def gclient_config(self): |
| 169 """Generate a 'gclient' configuration to check out Chromite. | 169 """Generate a 'gclient' configuration to check out Chromite. |
| 170 | 170 |
| 171 Return: (config) A 'gclient' recipe module configuration. | 171 Return: (config) A 'gclient' recipe module configuration. |
| 172 """ | 172 """ |
| 173 cfg = self.m.gclient.make_config() | 173 cfg = self.m.gclient.make_config(GIT_MODE=True) |
| 174 soln = cfg.solutions.add() | 174 soln = cfg.solutions.add() |
| 175 soln.name = 'chromite' | 175 soln.name = 'chromite' |
| 176 soln.url = self.chromite_url | 176 soln.url = self.chromite_url |
| 177 # Set the revision using 'bot_update' remote branch:revision notation. | 177 # Set the revision using 'bot_update' remote branch:revision notation. |
| 178 # Omitting the revision uses HEAD. | 178 # Omitting the revision uses HEAD. |
| 179 soln.revision = '%s:' % (self.c.chromite_branch,) | 179 soln.revision = '%s:' % (self.c.chromite_branch,) |
| 180 return cfg | 180 return cfg |
| 181 | 181 |
| 182 def checkout(self, manifest_url=None, repo_url=None): | 182 def checkout(self, manifest_url=None, repo_url=None): |
| 183 manifest_url = manifest_url or self.manifest_url | 183 manifest_url = manifest_url or self.manifest_url |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 cbb_args.extend(['--master-build-id', self.c.cbb.build_id]) | 363 cbb_args.extend(['--master-build-id', self.c.cbb.build_id]) |
| 364 | 364 |
| 365 # Add custom args, if there are any. | 365 # Add custom args, if there are any. |
| 366 cbb_args.extend(args) | 366 cbb_args.extend(args) |
| 367 | 367 |
| 368 # Run cbuildbot. | 368 # Run cbuildbot. |
| 369 return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)), | 369 return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)), |
| 370 self.c.cbb.config, | 370 self.c.cbb.config, |
| 371 args=cbb_args, | 371 args=cbb_args, |
| 372 cwd=self.m.path['slave_build']) | 372 cwd=self.m.path['slave_build']) |
| OLD | NEW |