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

Side by Side Diff: scripts/slave/recipe_modules/chromite/api.py

Issue 2319853002: Remove ignored bot_update "force" parameter. (Closed)
Patch Set: rebase Created 4 years, 3 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 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 264
265 def run_cbuildbot(self, args=[]): 265 def run_cbuildbot(self, args=[]):
266 self.checkout_chromite() 266 self.checkout_chromite()
267 self.run(args=args) 267 self.run(args=args)
268 268
269 def checkout_chromite(self): 269 def checkout_chromite(self):
270 """Checks out the configured Chromite branch. 270 """Checks out the configured Chromite branch.
271 """ 271 """
272 self.m.bot_update.ensure_checkout( 272 self.m.bot_update.ensure_checkout(
273 gclient_config=self.gclient_config(), 273 gclient_config=self.gclient_config(),
274 update_presentation=False, 274 update_presentation=False)
275 force=True)
276 275
277 if self.c.chromite_branch and self.c.cbb.disable_bootstrap: 276 if self.c.chromite_branch and self.c.cbb.disable_bootstrap:
278 # Chromite auto-detects which branch to build for based on its current 277 # Chromite auto-detects which branch to build for based on its current
279 # checkout. "bot_update" checks out remote branches, but Chromite requires 278 # checkout. "bot_update" checks out remote branches, but Chromite requires
280 # a local branch. 279 # a local branch.
281 # 280 #
282 # Normally we'd bootstrap, but if we're disabling bootstrapping, we have 281 # Normally we'd bootstrap, but if we're disabling bootstrapping, we have
283 # to checkout the local branch to let Chromite know which branch to build. 282 # to checkout the local branch to let Chromite know which branch to build.
284 self.m.git('checkout', self.c.chromite_branch, 283 self.m.git('checkout', self.c.chromite_branch,
285 name=str('checkout chromite branch [%s]' % (self.c.chromite_branch))) 284 name=str('checkout chromite branch [%s]' % (self.c.chromite_branch)))
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 cbb_args.extend(['--master-build-id', self.c.cbb.build_id]) 362 cbb_args.extend(['--master-build-id', self.c.cbb.build_id])
364 363
365 # Add custom args, if there are any. 364 # Add custom args, if there are any.
366 cbb_args.extend(args) 365 cbb_args.extend(args)
367 366
368 # Run cbuildbot. 367 # Run cbuildbot.
369 return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)), 368 return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),
370 self.c.cbb.config, 369 self.c.cbb.config,
371 args=cbb_args, 370 args=cbb_args,
372 cwd=self.m.path['slave_build']) 371 cwd=self.m.path['slave_build'])
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698