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

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/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 contextlib 5 import contextlib
6 import datetime 6 import datetime
7 import json 7 import json
8 import os 8 import os
9 import pipes 9 import pipes
10 import re 10 import re
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 s.managed = self.c.managed 116 s.managed = self.c.managed
117 s.revision = self.c.revision 117 s.revision = self.c.revision
118 spec.revisions = self.c.revisions 118 spec.revisions = self.c.revisions
119 119
120 self.m.gclient.break_locks() 120 self.m.gclient.break_locks()
121 refs = self.m.properties.get('event.patchSet.ref') 121 refs = self.m.properties.get('event.patchSet.ref')
122 if refs: 122 if refs:
123 refs = [refs] 123 refs = [refs]
124 if use_bot_update: 124 if use_bot_update:
125 result = self.m.bot_update.ensure_checkout( 125 result = self.m.bot_update.ensure_checkout(
126 spec, refs=refs, with_branch_heads=with_branch_heads, force=True) 126 spec, refs=refs, with_branch_heads=with_branch_heads)
127 else: 127 else:
128 result = self.m.gclient.checkout( 128 result = self.m.gclient.checkout(
129 spec, with_branch_heads=with_branch_heads) 129 spec, with_branch_heads=with_branch_heads)
130 130
131 # TODO(sivachandra): Manufacture gclient spec such that it contains "src" 131 # TODO(sivachandra): Manufacture gclient spec such that it contains "src"
132 # solution + repo_name solution. Then checkout will be automatically 132 # solution + repo_name solution. Then checkout will be automatically
133 # correctly set by gclient.checkout 133 # correctly set by gclient.checkout
134 self.m.path['checkout'] = self.m.path['slave_build'].join('src') 134 self.m.path['checkout'] = self.m.path['slave_build'].join('src')
135 135
136 self.clean_local_files() 136 self.clean_local_files()
(...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 script = self.c.test_runner 1498 script = self.c.test_runner
1499 if wrapper_script_suite_name: 1499 if wrapper_script_suite_name:
1500 script = self.m.chromium.output_dir.join('bin', 'run_%s' % 1500 script = self.m.chromium.output_dir.join('bin', 'run_%s' %
1501 wrapper_script_suite_name) 1501 wrapper_script_suite_name)
1502 else: 1502 else:
1503 env = kwargs.get('env', {}) 1503 env = kwargs.get('env', {})
1504 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', 1504 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
1505 self.m.chromium.output_dir) 1505 self.m.chromium.output_dir)
1506 kwargs['env'] = env 1506 kwargs['env'] = env
1507 return self.m.python(step_name, script, args, **kwargs) 1507 return self.m.python(step_name, script, args, **kwargs)
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromite/api.py ('k') | scripts/slave/recipe_modules/chromium_checkout/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698