scripts/slave/recipe_modules/chromium_checkout/api.py - Issue 2299993003: Temporary fix for Angle trybots.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2299993003: Temporary fix for Angle trybots. (Closed)

Patch Set: expectation changes. 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

« no previous file with comments | « scripts/slave/recipe_modules/chromium/example.expected/basic_out_dir.json ('k') | scripts/slave/recipes/bisect.expected/basic.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright 2016 The Chromium Authors. All rights reserved.	1 # Copyright 2016 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 recipe_engine import recipe_api	5 from recipe_engine import recipe_api

6	6

7	7

8 class ChromiumCheckoutApi(recipe_api.RecipeApi):	8 class ChromiumCheckoutApi(recipe_api.RecipeApi):

9 def __init__(self, args, *kwargs):	9 def __init__(self, args, *kwargs):

10 super(ChromiumCheckoutApi, self).__init__(args, *kwargs)	10 super(ChromiumCheckoutApi, self).__init__(args, *kwargs)

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 kwargs['cwd'] = self._working_dir	67 kwargs['cwd'] = self._working_dir

68	68

69 if self.m.platform.is_linux:	69 if self.m.platform.is_linux:

70 kwargs['env'] = {'GCLIENT_KILL_GIT_FETCH_AFTER': '1200'} # 20 minutes.	70 kwargs['env'] = {'GCLIENT_KILL_GIT_FETCH_AFTER': '1200'} # 20 minutes.

71	71

72 # Bot Update re-uses the gclient configs.	72 # Bot Update re-uses the gclient configs.

73 update_step = self.m.bot_update.ensure_checkout(	73 update_step = self.m.bot_update.ensure_checkout(

74 patch_root=bot_config.get('patch_root'),	74 patch_root=bot_config.get('patch_root'),

75 root_solution_revision=root_solution_revision,	75 root_solution_revision=root_solution_revision,

76 clobber=bot_config.get('clobber', False),	76 clobber=bot_config.get('clobber', False),

77 force=force, **kwargs)	77 force=force,

	78 # TODO(tandrii): remove this temp fix for Angle http://crbug.com/642914.

	79 gerrit_rebase_patch_ref=False,

	80 **kwargs)

78 assert update_step.json.output['did_run']	81 assert update_step.json.output['did_run']

79 # HACK(dnj): Remove after 'crbug.com/398105' has landed	82 # HACK(dnj): Remove after 'crbug.com/398105' has landed

80 self.m.chromium.set_build_properties(update_step.json.output['properties'])	83 self.m.chromium.set_build_properties(update_step.json.output['properties'])

81	84

82 return update_step	85 return update_step

OLD	NEW