blob: 039f205ac8b9cc4ef48c31957c73817764dbe165 [file] [log] [blame]
Mike Frysingere58c0e22017-10-04 15:43:30 -04001# -*- coding: utf-8 -*-
Mike Frysinger110750a2012-03-26 14:19:20 -04002# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
Chris Sosadad0d322011-01-31 16:37:33 -08003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""This module uprevs a given package's ebuild to the next revision."""
7
Mike Frysinger383367e2014-09-16 15:06:17 -04008from __future__ import print_function
9
Chris Sosadad0d322011-01-31 16:37:33 -080010import os
Chris Sosadad0d322011-01-31 16:37:33 -080011
Aviv Keshetb7519e12016-10-04 00:50:00 -070012from chromite.lib import constants
Mike Frysingere8dcbfd2015-03-08 21:45:52 -040013from chromite.lib import commandline
Chris Sosac13bba52011-05-24 15:14:09 -070014from chromite.lib import cros_build_lib
Ralph Nathan03047282015-03-23 11:09:32 -070015from chromite.lib import cros_logging as logging
David James97d95872012-11-16 15:09:56 -080016from chromite.lib import git
Mike Frysingerfddaeb52012-11-20 11:17:31 -050017from chromite.lib import osutils
David James6450a0a2012-12-04 07:59:53 -080018from chromite.lib import parallel
Alex Deymo075c2292014-09-04 18:31:50 -070019from chromite.lib import portage_util
Lann Martinb26e1292018-08-09 13:59:19 -060020from chromite.lib import repo_util
Chris Sosac13bba52011-05-24 15:14:09 -070021
Gabe Black71e963e2014-10-28 20:19:59 -070022# Commit message subject for uprevving Portage packages.
23GIT_COMMIT_SUBJECT = 'Marking set of ebuilds as stable'
David James15ed1302013-04-25 09:21:19 -070024
David James29e86d52013-04-19 09:41:29 -070025# Commit message for uprevving Portage packages.
26_GIT_COMMIT_MESSAGE = 'Marking 9999 ebuild for %s as stable.'
27
Chris Sosadad0d322011-01-31 16:37:33 -080028# Dictionary of valid commands with usage information.
29COMMAND_DICTIONARY = {
Mike Frysinger5cd8c742013-10-11 14:43:01 -040030 'commit': 'Marks given ebuilds as stable locally',
31 'push': 'Pushes previous marking of ebuilds to remote repo',
32}
Chris Sosadad0d322011-01-31 16:37:33 -080033
Chris Sosadad0d322011-01-31 16:37:33 -080034
Chris Sosadad0d322011-01-31 16:37:33 -080035# ======================= Global Helper Functions ========================
36
37
David James41124af2015-06-04 21:13:25 -070038def CleanStalePackages(srcroot, boards, package_atoms):
Chris Sosabf153872011-04-28 14:21:09 -070039 """Cleans up stale package info from a previous build.
Mike Frysinger5cd8c742013-10-11 14:43:01 -040040
Chris Sosabf153872011-04-28 14:21:09 -070041 Args:
David James41124af2015-06-04 21:13:25 -070042 srcroot: Root directory of the source tree.
David Jamescc09c9b2012-01-26 22:10:13 -080043 boards: Boards to clean the packages from.
Mike Frysingerde5ab0e2013-03-21 20:48:36 -040044 package_atoms: A list of package atoms to unmerge.
Chris Sosabf153872011-04-28 14:21:09 -070045 """
David James15ed1302013-04-25 09:21:19 -070046 if package_atoms:
Ralph Nathan03047282015-03-23 11:09:32 -070047 logging.info('Cleaning up stale packages %s.' % package_atoms)
David James15ed1302013-04-25 09:21:19 -070048
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040049 # First unmerge all the packages for a board, then eclean it.
50 # We need these two steps to run in order (unmerge/eclean),
51 # but we can let all the boards run in parallel.
52 def _CleanStalePackages(board):
53 if board:
54 suffix = '-' + board
55 runcmd = cros_build_lib.RunCommand
56 else:
57 suffix = ''
58 runcmd = cros_build_lib.SudoRunCommand
Chris Sosadad0d322011-01-31 16:37:33 -080059
David James59a0a2b2013-03-22 14:04:44 -070060 emerge, eclean = 'emerge' + suffix, 'eclean' + suffix
61 if not osutils.FindMissingBinaries([emerge, eclean]):
David James63841a82014-01-16 14:39:24 -080062 if package_atoms:
63 # If nothing was found to be unmerged, emerge will exit(1).
64 result = runcmd([emerge, '-q', '--unmerge'] + package_atoms,
David James41124af2015-06-04 21:13:25 -070065 enter_chroot=True, extra_env={'CLEAN_DELAY': '0'},
66 error_code_ok=True, cwd=srcroot)
David James63841a82014-01-16 14:39:24 -080067 if not result.returncode in (0, 1):
68 raise cros_build_lib.RunCommandError('unexpected error', result)
David James59a0a2b2013-03-22 14:04:44 -070069 runcmd([eclean, '-d', 'packages'],
David James41124af2015-06-04 21:13:25 -070070 cwd=srcroot, enter_chroot=True,
David James59a0a2b2013-03-22 14:04:44 -070071 redirect_stdout=True, redirect_stderr=True)
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040072
73 tasks = []
David Jamescc09c9b2012-01-26 22:10:13 -080074 for board in boards:
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040075 tasks.append([board])
76 tasks.append([None])
77
David James6450a0a2012-12-04 07:59:53 -080078 parallel.RunTasksInProcessPool(_CleanStalePackages, tasks)
Chris Sosadad0d322011-01-31 16:37:33 -080079
80
Mike Frysinger2ebe3732012-05-08 17:04:12 -040081# TODO(build): This code needs to be gutted and rebased to cros_build_lib.
82def _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
Chris Sosadad0d322011-01-31 16:37:33 -080083 """Returns true if there are local commits."""
David James97d95872012-11-16 15:09:56 -080084 output = git.RunGit(
Paul Hobbs72d8e392015-10-21 17:24:23 -070085 cwd, ['rev-parse', stable_branch, tracking_branch]).output.split()
Brian Harring5b86b5e2012-05-25 18:27:40 -070086 return output[0] != output[1]
Chris Sosadad0d322011-01-31 16:37:33 -080087
88
Chris Sosadad0d322011-01-31 16:37:33 -080089# ======================= End Global Helper Functions ========================
90
91
Ningning Xia52009062016-05-09 14:33:51 -070092def PushChange(stable_branch, tracking_branch, dryrun, cwd,
93 staging_branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -080094 """Pushes commits in the stable_branch to the remote git repository.
95
David Jamesee2da622012-02-23 09:32:16 -080096 Pushes local commits from calls to CommitChange to the remote git
David James66009462012-03-25 10:08:38 -070097 repository specified by current working directory. If changes are
98 found to commit, they will be merged to the merge branch and pushed.
99 In that case, the local repository will be left on the merge branch.
Chris Sosadad0d322011-01-31 16:37:33 -0800100
101 Args:
102 stable_branch: The local branch with commits we want to push.
103 tracking_branch: The tracking branch of the local branch.
Chris Sosa62ad8522011-03-08 17:46:17 -0800104 dryrun: Use git push --dryrun to emulate a push.
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400105 cwd: The directory to run commands in.
Ningning Xia52009062016-05-09 14:33:51 -0700106 staging_branch: The staging branch to push for a failed PFQ run
Mike Frysinger1a736a82013-12-12 01:50:59 -0500107
Chris Sosadad0d322011-01-31 16:37:33 -0800108 Raises:
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400109 OSError: Error occurred while pushing.
Chris Sosadad0d322011-01-31 16:37:33 -0800110 """
David James47959632015-10-23 07:56:01 -0700111 if not git.DoesCommitExistInRepo(cwd, stable_branch):
112 logging.debug('No branch created for %s. Exiting', cwd)
113 return
114
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400115 if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
David James47959632015-10-23 07:56:01 -0700116 logging.debug('No work found to push in %s. Exiting', cwd)
Chris Sosadad0d322011-01-31 16:37:33 -0800117 return
118
David James66009462012-03-25 10:08:38 -0700119 # For the commit queue, our local branch may contain commits that were
120 # just tested and pushed during the CommitQueueCompletion stage. Sync
121 # and rebase our local branch on top of the remote commits.
Paul Hobbs72d8e392015-10-21 17:24:23 -0700122 remote_ref = git.GetTrackingBranch(cwd,
123 branch=stable_branch,
124 for_push=True)
Paul Hobbs1e46be82015-10-30 13:46:02 -0700125 # SyncPushBranch rebases HEAD onto the updated remote. We need to checkout
126 # stable_branch here in order to update it.
127 git.RunGit(cwd, ['checkout', stable_branch])
Don Garrett99449592015-03-25 11:01:30 -0700128 git.SyncPushBranch(cwd, remote_ref.remote, remote_ref.ref)
David James66009462012-03-25 10:08:38 -0700129
130 # Check whether any local changes remain after the sync.
Don Garrett99449592015-03-25 11:01:30 -0700131 if not _DoWeHaveLocalCommits(stable_branch, remote_ref.ref, cwd):
Ralph Nathan03047282015-03-23 11:09:32 -0700132 logging.info('All changes already pushed for %s. Exiting', cwd)
David James66009462012-03-25 10:08:38 -0700133 return
134
Matt Tennantcb522052013-11-25 14:23:43 -0800135 # Add a failsafe check here. Only CLs from the 'chrome-bot' user should
136 # be involved here. If any other CLs are found then complain.
137 # In dryruns extra CLs are normal, though, and can be ignored.
138 bad_cl_cmd = ['log', '--format=short', '--perl-regexp',
139 '--author', '^(?!chrome-bot)', '%s..%s' % (
Don Garrett99449592015-03-25 11:01:30 -0700140 remote_ref.ref, stable_branch)]
Matt Tennantcb522052013-11-25 14:23:43 -0800141 bad_cls = git.RunGit(cwd, bad_cl_cmd).output
142 if bad_cls.strip() and not dryrun:
Ralph Nathan59900422015-03-24 10:41:17 -0700143 logging.error('The Uprev stage found changes from users other than '
144 'chrome-bot:\n\n%s', bad_cls)
Matt Tennantcb522052013-11-25 14:23:43 -0800145 raise AssertionError('Unexpected CLs found during uprev stage.')
146
Lev Rumyantsev25352ba2016-09-07 15:53:58 -0700147 if staging_branch is not None:
148 logging.info('PFQ FAILED. Pushing uprev change to staging branch %s',
149 staging_branch)
150
Mike Frysingere65f3752014-12-08 00:46:39 -0500151 description = git.RunGit(
152 cwd,
153 ['log', '--format=format:%s%n%n%b',
Don Garrett99449592015-03-25 11:01:30 -0700154 '%s..%s' % (remote_ref.ref, stable_branch)]).output
Gabe Black71e963e2014-10-28 20:19:59 -0700155 description = '%s\n\n%s' % (GIT_COMMIT_SUBJECT, description)
Ralph Nathan03047282015-03-23 11:09:32 -0700156 logging.info('For %s, using description %s', cwd, description)
Paul Hobbsf52ea8f2015-10-21 17:24:23 -0700157 git.CreatePushBranch(constants.MERGE_BRANCH, cwd,
158 remote_push_branch=remote_ref)
David James97d95872012-11-16 15:09:56 -0800159 git.RunGit(cwd, ['merge', '--squash', stable_branch])
160 git.RunGit(cwd, ['commit', '-m', description])
161 git.RunGit(cwd, ['config', 'push.default', 'tracking'])
Mike Nicholsa6818c52018-04-09 11:05:42 -0600162 git.PushBranch(constants.MERGE_BRANCH, cwd, dryrun=dryrun,
163 staging_branch=staging_branch)
Chris Sosadad0d322011-01-31 16:37:33 -0800164
165
166class GitBranch(object):
167 """Wrapper class for a git branch."""
168
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400169 def __init__(self, branch_name, tracking_branch, cwd):
David Jamesc7c4ff52013-09-18 17:57:13 -0700170 """Sets up variables but does not create the branch.
171
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400172 Args:
David Jamesc7c4ff52013-09-18 17:57:13 -0700173 branch_name: The name of the branch.
174 tracking_branch: The associated tracking branch.
175 cwd: The git repository to work in.
176 """
Chris Sosadad0d322011-01-31 16:37:33 -0800177 self.branch_name = branch_name
178 self.tracking_branch = tracking_branch
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400179 self.cwd = cwd
Chris Sosadad0d322011-01-31 16:37:33 -0800180
181 def CreateBranch(self):
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400182 self.Checkout()
Chris Sosadad0d322011-01-31 16:37:33 -0800183
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400184 def Checkout(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800185 """Function used to check out to another GitBranch."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400186 if not branch:
187 branch = self.branch_name
188 if branch == self.tracking_branch or self.Exists(branch):
Lann Martinb26e1292018-08-09 13:59:19 -0600189 git.RunGit(self.cwd, ['checkout', '-f', branch], quiet=True)
Chris Sosadad0d322011-01-31 16:37:33 -0800190 else:
Lann Martinb26e1292018-08-09 13:59:19 -0600191 repo = repo_util.Repository.MustFind(self.cwd)
192 repo.StartBranch(branch, projects=['.'], cwd=self.cwd)
Chris Sosadad0d322011-01-31 16:37:33 -0800193
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400194 def Exists(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800195 """Returns True if the branch exists."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400196 if not branch:
197 branch = self.branch_name
David James67d73252013-09-19 17:33:12 -0700198 branches = git.RunGit(self.cwd, ['branch']).output
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400199 return branch in branches.split()
Chris Sosadad0d322011-01-31 16:37:33 -0800200
201
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400202def GetParser():
203 """Creates the argparse parser."""
204 parser = commandline.ArgumentParser()
205 parser.add_argument('--all', action='store_true',
206 help='Mark all packages as stable.')
207 parser.add_argument('-b', '--boards', default='',
208 help='Colon-separated list of boards.')
209 parser.add_argument('--drop_file',
210 help='File to list packages that were revved.')
211 parser.add_argument('--dryrun', action='store_true',
212 help='Passes dry-run to git push if pushing a change.')
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700213 parser.add_argument('--force', action='store_true',
214 help='Force the stabilization of blacklisted packages. '
215 '(only compatible with -p)')
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400216 parser.add_argument('-o', '--overlays',
217 help='Colon-separated list of overlays to modify.')
218 parser.add_argument('-p', '--packages',
219 help='Colon separated list of packages to rev.')
220 parser.add_argument('-r', '--srcroot', type='path',
221 default=os.path.join(constants.SOURCE_ROOT, 'src'),
222 help='Path to root src directory.')
223 parser.add_argument('--verbose', action='store_true',
224 help='Prints out debug info.')
Ningning Xia52009062016-05-09 14:33:51 -0700225 parser.add_argument('--staging_branch',
226 help='The staging branch to push changes')
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400227 parser.add_argument('command', choices=COMMAND_DICTIONARY.keys(),
228 help='Command to run.')
229 return parser
230
231
232def main(argv):
233 parser = GetParser()
234 options = parser.parse_args(argv)
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700235 options.Freeze()
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400236
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700237 if options.command == 'commit':
238 if not options.packages and not options.all:
239 parser.error('Please specify at least one package (--packages)')
240 if options.force and options.all:
241 parser.error('Cannot use --force with --all. You must specify a list of '
242 'packages you want to force uprev.')
243
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400244 if not os.path.isdir(options.srcroot):
245 parser.error('srcroot is not a valid path: %s' % options.srcroot)
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400246
Alex Deymo075c2292014-09-04 18:31:50 -0700247 portage_util.EBuild.VERBOSE = options.verbose
Chris Sosa62ad8522011-03-08 17:46:17 -0800248
Chris Sosa62ad8522011-03-08 17:46:17 -0800249 package_list = None
250 if options.packages:
251 package_list = options.packages.split(':')
252
Ningning Xiadb884322018-01-26 16:27:06 -0800253 overlays = []
Chris Sosa62ad8522011-03-08 17:46:17 -0800254 if options.overlays:
Chris Sosa62ad8522011-03-08 17:46:17 -0800255 for path in options.overlays.split(':'):
Ryan Cui05a31ba2011-05-31 17:47:37 -0700256 if not os.path.isdir(path):
Chris Sosac13bba52011-05-24 15:14:09 -0700257 cros_build_lib.Die('Cannot find overlay: %s' % path)
Ningning Xiadb884322018-01-26 16:27:06 -0800258 overlays.append(os.path.realpath(path))
Chris Sosadad0d322011-01-31 16:37:33 -0800259 else:
Ralph Nathan446aee92015-03-23 14:44:56 -0700260 logging.warning('Missing --overlays argument')
Ningning Xiadb884322018-01-26 16:27:06 -0800261 overlays.extend([
262 '%s/private-overlays/chromeos-overlay' % options.srcroot,
263 '%s/third_party/chromiumos-overlay' % options.srcroot])
Chris Sosadad0d322011-01-31 16:37:33 -0800264
David James97d95872012-11-16 15:09:56 -0800265 manifest = git.ManifestCheckout.Cached(options.srcroot)
Ryan Cui4656a3c2011-05-24 12:30:30 -0700266
Ningning Xia419e4eb2018-02-05 10:30:36 -0800267 # Dict mapping from each overlay to its tracking branch.
268 overlay_tracking_branch = {}
269 # Dict mapping from each git repository (project) to a list of its overlays.
270 git_project_overlays = {}
271
272 for overlay in overlays:
273 remote_ref = git.GetTrackingBranchViaManifest(overlay, manifest=manifest)
274 overlay_tracking_branch[overlay] = remote_ref.ref
275 git_project_overlays.setdefault(remote_ref.project_name, []).append(overlay)
276
277 if options.command == 'push':
278 _WorkOnPush(options, overlay_tracking_branch, git_project_overlays)
279 elif options.command == 'commit':
280 _WorkOnCommit(options, overlays, overlay_tracking_branch,
281 git_project_overlays, manifest, package_list)
282
283
284def _WorkOnPush(options, overlay_tracking_branch, git_project_overlays):
285 """Push uprevs of overlays belonging to differet git projects in parallel.
286
287 Args:
288 options: The options object returned by the argument parser.
289 overlay_tracking_branch: A dict mapping from each overlay to its tracking
290 branch.
291 git_project_overlays: A dict mapping from each git repository to a list of
292 its overlays.
293 """
294 inputs = [[options, overlays_per_project, overlay_tracking_branch]
295 for overlays_per_project in git_project_overlays.itervalues()]
296 parallel.RunTasksInProcessPool(_PushOverlays, inputs)
297
298
299def _PushOverlays(options, overlays, overlay_tracking_branch):
300 """Push uprevs for overlays in sequence.
301
302 Args:
303 options: The options object returned by the argument parser.
304 overlays: A list of overlays to push uprevs in sequence.
305 overlay_tracking_branch: A dict mapping from each overlay to its tracking
306 branch.
307 """
308 for overlay in overlays:
309 if not os.path.isdir(overlay):
310 logging.warning('Skipping %s, which is not a directory.', overlay)
311 continue
312
313 tracking_branch = overlay_tracking_branch[overlay]
314 PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch, options.dryrun,
315 cwd=overlay, staging_branch=options.staging_branch)
316
317
318def _WorkOnCommit(options, overlays, overlay_tracking_branch,
319 git_project_overlays, manifest, package_list):
320 """Commit uprevs of overlays belonging to different git projects in parallel.
321
322 Args:
323 options: The options object returned by the argument parser.
324 overlays: A list of overlays to work on.
325 overlay_tracking_branch: A dict mapping from each overlay to its tracking
326 branch.
327 git_project_overlays: A dict mapping from each git repository to a list of
328 its overlays.
329 manifest: The manifest of the given source root.
330 package_list: A list of packages passed from commandline to work on.
331 """
332 overlay_ebuilds = _GetOverlayToEbuildsMap(options, overlays, package_list)
David James84e953c2013-04-23 18:44:06 -0700333
Ningning Xia783efc02018-01-24 13:39:51 -0800334 with parallel.Manager() as manager:
335 # Contains the array of packages we actually revved.
336 revved_packages = manager.list()
337 new_package_atoms = manager.list()
David Jamesa8457b52011-05-28 00:03:20 -0700338
Ningning Xia419e4eb2018-02-05 10:30:36 -0800339 inputs = [[options, manifest, overlays_per_project, overlay_tracking_branch,
340 overlay_ebuilds, revved_packages, new_package_atoms]
341 for overlays_per_project in git_project_overlays.itervalues()]
342 parallel.RunTasksInProcessPool(_CommitOverlays, inputs)
Chris Sosadad0d322011-01-31 16:37:33 -0800343
Ningning Xia419e4eb2018-02-05 10:30:36 -0800344 chroot_path = os.path.join(options.srcroot, constants.DEFAULT_CHROOT_DIR)
345 if os.path.exists(chroot_path):
346 CleanStalePackages(options.srcroot, options.boards.split(':'),
347 new_package_atoms)
348 if options.drop_file:
349 osutils.WriteFile(options.drop_file, ' '.join(revved_packages))
Chris Sosadad0d322011-01-31 16:37:33 -0800350
Brian Harring609dc4e2012-05-07 02:17:44 -0700351
Ningning Xia419e4eb2018-02-05 10:30:36 -0800352def _GetOverlayToEbuildsMap(options, overlays, package_list):
353 """Get ebuilds for overlays.
David James15ed1302013-04-25 09:21:19 -0700354
Ningning Xia783efc02018-01-24 13:39:51 -0800355 Args:
Ningning Xia783efc02018-01-24 13:39:51 -0800356 options: The options object returned by the argument parser.
Ningning Xia419e4eb2018-02-05 10:30:36 -0800357 overlays: A list of overlays to work on.
358 package_list: A list of packages passed from commandline to work on.
359
360 Returns:
361 A dict mapping each overlay to a list of ebuilds belonging to it.
362 """
363 overlay_ebuilds = {}
364 inputs = [[overlay, options.all, package_list, options.force]
365 for overlay in overlays]
366 result = parallel.RunTasksInProcessPool(
367 portage_util.GetOverlayEBuilds, inputs)
368 for idx, ebuilds in enumerate(result):
369 overlay_ebuilds[overlays[idx]] = ebuilds
370
371 return overlay_ebuilds
372
373
374def _CommitOverlays(options, manifest, overlays, overlay_tracking_branch,
375 overlay_ebuilds, revved_packages, new_package_atoms):
376 """Commit uprevs for overlays in sequence.
377
378 Args:
379 options: The options object returned by the argument parser.
380 manifest: The manifest of the given source root.
381 overlays: A list over overlays to commit.
382 overlay_tracking_branch: A dict mapping from each overlay to its tracking
383 branch.
384 overlay_ebuilds: A dict mapping overlays to their ebuilds.
Ningning Xia783efc02018-01-24 13:39:51 -0800385 revved_packages: A shared list of revved packages.
386 new_package_atoms: A shared list of new package atoms.
387 """
Ningning Xia419e4eb2018-02-05 10:30:36 -0800388 for overlay in overlays:
389 if not os.path.isdir(overlay):
390 logging.warning('Skipping %s, which is not a directory.', overlay)
391 continue
Ningning Xia783efc02018-01-24 13:39:51 -0800392
Ningning Xia419e4eb2018-02-05 10:30:36 -0800393 # Note we intentionally work from the non push tracking branch;
394 # everything built thus far has been against it (meaning, http mirrors),
395 # thus we should honor that. During the actual push, the code switches
396 # to the correct urls, and does an appropriate rebasing.
397 tracking_branch = overlay_tracking_branch[overlay]
Ningning Xia783efc02018-01-24 13:39:51 -0800398
Ningning Xia783efc02018-01-24 13:39:51 -0800399 existing_commit = git.GetGitRepoRevision(overlay)
Lann Martine0ef98c2018-06-11 13:12:24 -0600400
401 # Make sure we run in the top-level git directory in case we are
402 # adding/removing an overlay in existing_commit.
403 git_root = git.FindGitTopLevel(overlay)
404 if git_root is None:
405 cros_build_lib.Die('No git repo at overlay directory %s.', overlay)
406
Ningning Xia783efc02018-01-24 13:39:51 -0800407 work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch,
Lann Martine0ef98c2018-06-11 13:12:24 -0600408 cwd=git_root)
Ningning Xia783efc02018-01-24 13:39:51 -0800409 work_branch.CreateBranch()
410 if not work_branch.Exists():
411 cros_build_lib.Die('Unable to create stabilizing branch in %s' %
412 overlay)
413
414 # In the case of uprevving overlays that have patches applied to them,
415 # include the patched changes in the stabilizing branch.
Lann Martine0ef98c2018-06-11 13:12:24 -0600416 git.RunGit(git_root, ['rebase', existing_commit])
Ningning Xia783efc02018-01-24 13:39:51 -0800417
Ningning Xiadb884322018-01-26 16:27:06 -0800418 ebuilds = overlay_ebuilds.get(overlay, [])
Ningning Xia783efc02018-01-24 13:39:51 -0800419 if ebuilds:
Ningning Xia419e4eb2018-02-05 10:30:36 -0800420 with parallel.Manager() as manager:
421 # Contains the array of packages we actually revved.
422 messages = manager.list()
423 ebuild_paths_to_add = manager.list()
424 ebuild_paths_to_remove = manager.list()
Ningning Xia783efc02018-01-24 13:39:51 -0800425
Ningning Xia419e4eb2018-02-05 10:30:36 -0800426 inputs = [[overlay, ebuild, manifest, options, ebuild_paths_to_add,
427 ebuild_paths_to_remove, messages, revved_packages,
428 new_package_atoms] for ebuild in ebuilds]
429 parallel.RunTasksInProcessPool(_WorkOnEbuild, inputs)
Ningning Xia783efc02018-01-24 13:39:51 -0800430
Ningning Xia419e4eb2018-02-05 10:30:36 -0800431 if ebuild_paths_to_add:
432 logging.info('Adding new stable ebuild paths %s in overlay %s.',
433 ebuild_paths_to_add, overlay)
434 git.RunGit(overlay, ['add'] + list(ebuild_paths_to_add))
David James15ed1302013-04-25 09:21:19 -0700435
Ningning Xia419e4eb2018-02-05 10:30:36 -0800436 if ebuild_paths_to_remove:
437 logging.info('Removing old ebuild paths %s in overlay %s.',
438 ebuild_paths_to_remove, overlay)
439 git.RunGit(overlay, ['rm', '-f'] + list(ebuild_paths_to_remove))
440
441 if messages:
442 portage_util.EBuild.CommitChange('\n\n'.join(messages), overlay)
David James15ed1302013-04-25 09:21:19 -0700443
Ningning Xia783efc02018-01-24 13:39:51 -0800444
445def _WorkOnEbuild(overlay, ebuild, manifest, options, ebuild_paths_to_add,
446 ebuild_paths_to_remove, messages, revved_packages,
447 new_package_atoms):
448 """Work on a single ebuild.
449
450 Args:
451 overlay: The overlay where the ebuild belongs to.
452 ebuild: The ebuild to work on.
453 manifest: The manifest of the given source root.
454 options: The options object returned by the argument parser.
455 ebuild_paths_to_add: New stable ebuild paths to add to git.
456 ebuild_paths_to_remove: Old ebuild paths to remove from git.
457 messages: A share list of commit messages.
458 revved_packages: A shared list of revved packages.
459 new_package_atoms: A shared list of new package atoms.
460 """
461 if options.verbose:
462 logging.info('Working on %s, info %s', ebuild.package,
463 ebuild.cros_workon_vars)
464 try:
465 result = ebuild.RevWorkOnEBuild(options.srcroot, manifest)
466 if result:
467 new_package, ebuild_path_to_add, ebuild_path_to_remove = result
468
469 if ebuild_path_to_add:
470 ebuild_paths_to_add.append(ebuild_path_to_add)
471 if ebuild_path_to_remove:
472 ebuild_paths_to_remove.append(ebuild_path_to_remove)
473
474 messages.append(_GIT_COMMIT_MESSAGE % ebuild.package)
475 revved_packages.append(ebuild.package)
476 new_package_atoms.append('=%s' % new_package)
477 except (OSError, IOError):
478 logging.warning(
479 'Cannot rev %s\n'
480 'Note you will have to go into %s '
Ningning Xia419e4eb2018-02-05 10:30:36 -0800481 'and reset the git repo yourself.', ebuild.package, overlay)
Ningning Xia783efc02018-01-24 13:39:51 -0800482 raise