blob: c773c497e54482a8f2ac9fce591ce9cd91cbd7d4 [file] [log] [blame]
Chris Sosadad0d322011-01-31 16:37:33 -08001#!/usr/bin/python
2
Mike Frysinger110750a2012-03-26 14:19:20 -04003# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
Chris Sosadad0d322011-01-31 16:37:33 -08004# Use of this source code is governed by a BSD-style license that can be
5# found in the LICENSE file.
6
7"""This module uprevs a given package's ebuild to the next revision."""
8
Chris Sosa62ad8522011-03-08 17:46:17 -08009import optparse
Chris Sosadad0d322011-01-31 16:37:33 -080010import os
Chris Sosadad0d322011-01-31 16:37:33 -080011import sys
12
Mike Frysinger6cb624a2012-05-24 18:17:38 -040013from chromite.buildbot import constants
David James66009462012-03-25 10:08:38 -070014from chromite.buildbot import portage_utilities
Chris Sosac13bba52011-05-24 15:14:09 -070015from chromite.lib import cros_build_lib
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
Chris Sosac13bba52011-05-24 15:14:09 -070019
David James15ed1302013-04-25 09:21:19 -070020
David James29e86d52013-04-19 09:41:29 -070021# Commit message for uprevving Portage packages.
22_GIT_COMMIT_MESSAGE = 'Marking 9999 ebuild for %s as stable.'
23
Chris Sosadad0d322011-01-31 16:37:33 -080024# Dictionary of valid commands with usage information.
25COMMAND_DICTIONARY = {
Mike Frysinger5cd8c742013-10-11 14:43:01 -040026 'commit': 'Marks given ebuilds as stable locally',
27 'push': 'Pushes previous marking of ebuilds to remote repo',
28}
Chris Sosadad0d322011-01-31 16:37:33 -080029
Chris Sosadad0d322011-01-31 16:37:33 -080030
Chris Sosadad0d322011-01-31 16:37:33 -080031# ======================= Global Helper Functions ========================
32
33
David Jamescc09c9b2012-01-26 22:10:13 -080034def CleanStalePackages(boards, package_atoms):
Chris Sosabf153872011-04-28 14:21:09 -070035 """Cleans up stale package info from a previous build.
Mike Frysinger5cd8c742013-10-11 14:43:01 -040036
Chris Sosabf153872011-04-28 14:21:09 -070037 Args:
David Jamescc09c9b2012-01-26 22:10:13 -080038 boards: Boards to clean the packages from.
Mike Frysingerde5ab0e2013-03-21 20:48:36 -040039 package_atoms: A list of package atoms to unmerge.
Chris Sosabf153872011-04-28 14:21:09 -070040 """
David James15ed1302013-04-25 09:21:19 -070041 if package_atoms:
42 cros_build_lib.Info('Cleaning up stale packages %s.' % package_atoms)
43
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040044 # First unmerge all the packages for a board, then eclean it.
45 # We need these two steps to run in order (unmerge/eclean),
46 # but we can let all the boards run in parallel.
47 def _CleanStalePackages(board):
48 if board:
49 suffix = '-' + board
50 runcmd = cros_build_lib.RunCommand
51 else:
52 suffix = ''
53 runcmd = cros_build_lib.SudoRunCommand
Chris Sosadad0d322011-01-31 16:37:33 -080054
David James59a0a2b2013-03-22 14:04:44 -070055 emerge, eclean = 'emerge' + suffix, 'eclean' + suffix
56 if not osutils.FindMissingBinaries([emerge, eclean]):
Mike Frysingerde5ab0e2013-03-21 20:48:36 -040057 # If nothing was found to be unmerged, emerge will exit(1).
David James59a0a2b2013-03-22 14:04:44 -070058 result = runcmd([emerge, '-q', '--unmerge'] + package_atoms,
Mike Frysingerde5ab0e2013-03-21 20:48:36 -040059 extra_env={'CLEAN_DELAY': '0'}, error_code_ok=True)
60 if not result.returncode in (0, 1):
61 raise cros_build_lib.RunCommandError('unexpected error', result)
David James59a0a2b2013-03-22 14:04:44 -070062 runcmd([eclean, '-d', 'packages'],
63 redirect_stdout=True, redirect_stderr=True)
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040064
65 tasks = []
David Jamescc09c9b2012-01-26 22:10:13 -080066 for board in boards:
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040067 tasks.append([board])
68 tasks.append([None])
69
David James6450a0a2012-12-04 07:59:53 -080070 parallel.RunTasksInProcessPool(_CleanStalePackages, tasks)
Chris Sosadad0d322011-01-31 16:37:33 -080071
72
Mike Frysinger2ebe3732012-05-08 17:04:12 -040073# TODO(build): This code needs to be gutted and rebased to cros_build_lib.
74def _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
Chris Sosadad0d322011-01-31 16:37:33 -080075 """Returns true if there are local commits."""
David James97d95872012-11-16 15:09:56 -080076 current_branch = git.GetCurrentBranch(cwd)
Brian Harring609dc4e2012-05-07 02:17:44 -070077
78 if current_branch != stable_branch:
Chris Sosadad0d322011-01-31 16:37:33 -080079 return False
David James97d95872012-11-16 15:09:56 -080080 output = git.RunGit(
Brian Harring609dc4e2012-05-07 02:17:44 -070081 cwd, ['rev-parse', 'HEAD', tracking_branch]).output.split()
Brian Harring5b86b5e2012-05-25 18:27:40 -070082 return output[0] != output[1]
Chris Sosadad0d322011-01-31 16:37:33 -080083
84
David James1b363582012-12-17 11:53:11 -080085def _CheckSaneArguments(command, options):
Chris Sosadad0d322011-01-31 16:37:33 -080086 """Checks to make sure the flags are sane. Dies if arguments are not sane."""
87 if not command in COMMAND_DICTIONARY.keys():
88 _PrintUsageAndDie('%s is not a valid command' % command)
Chris Sosa62ad8522011-03-08 17:46:17 -080089 if not options.packages and command == 'commit' and not options.all:
Chris Sosadad0d322011-01-31 16:37:33 -080090 _PrintUsageAndDie('Please specify at least one package')
Mike Frysinger8fd67dc2012-12-03 23:51:18 -050091 if options.boards:
92 cros_build_lib.AssertInsideChroot()
Chris Sosa62ad8522011-03-08 17:46:17 -080093 if not os.path.isdir(options.srcroot):
Chris Sosadad0d322011-01-31 16:37:33 -080094 _PrintUsageAndDie('srcroot is not a valid path')
Chris Sosa62ad8522011-03-08 17:46:17 -080095 options.srcroot = os.path.abspath(options.srcroot)
Chris Sosadad0d322011-01-31 16:37:33 -080096
97
98def _PrintUsageAndDie(error_message=''):
99 """Prints optional error_message the usage and returns an error exit code."""
100 command_usage = 'Commands: \n'
101 # Add keys and usage information from dictionary.
102 commands = sorted(COMMAND_DICTIONARY.keys())
103 for command in commands:
104 command_usage += ' %s: %s\n' % (command, COMMAND_DICTIONARY[command])
105 commands_str = '|'.join(commands)
Chris Sosac13bba52011-05-24 15:14:09 -0700106 cros_build_lib.Warning('Usage: %s FLAGS [%s]\n\n%s' % (
107 sys.argv[0], commands_str, command_usage))
Chris Sosadad0d322011-01-31 16:37:33 -0800108 if error_message:
Chris Sosac13bba52011-05-24 15:14:09 -0700109 cros_build_lib.Die(error_message)
Chris Sosadad0d322011-01-31 16:37:33 -0800110 else:
111 sys.exit(1)
112
113
Chris Sosadad0d322011-01-31 16:37:33 -0800114# ======================= End Global Helper Functions ========================
115
116
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400117def PushChange(stable_branch, tracking_branch, dryrun, cwd):
Chris Sosadad0d322011-01-31 16:37:33 -0800118 """Pushes commits in the stable_branch to the remote git repository.
119
David Jamesee2da622012-02-23 09:32:16 -0800120 Pushes local commits from calls to CommitChange to the remote git
David James66009462012-03-25 10:08:38 -0700121 repository specified by current working directory. If changes are
122 found to commit, they will be merged to the merge branch and pushed.
123 In that case, the local repository will be left on the merge branch.
Chris Sosadad0d322011-01-31 16:37:33 -0800124
125 Args:
126 stable_branch: The local branch with commits we want to push.
127 tracking_branch: The tracking branch of the local branch.
Chris Sosa62ad8522011-03-08 17:46:17 -0800128 dryrun: Use git push --dryrun to emulate a push.
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400129 cwd: The directory to run commands in.
Chris Sosadad0d322011-01-31 16:37:33 -0800130 Raises:
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400131 OSError: Error occurred while pushing.
Chris Sosadad0d322011-01-31 16:37:33 -0800132 """
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400133 if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
Brian Harring609dc4e2012-05-07 02:17:44 -0700134 cros_build_lib.Info('No work found to push in %s. Exiting', cwd)
Chris Sosadad0d322011-01-31 16:37:33 -0800135 return
136
David James66009462012-03-25 10:08:38 -0700137 # For the commit queue, our local branch may contain commits that were
138 # just tested and pushed during the CommitQueueCompletion stage. Sync
139 # and rebase our local branch on top of the remote commits.
David James97d95872012-11-16 15:09:56 -0800140 remote, push_branch = git.GetTrackingBranch(cwd, for_push=True)
141 git.SyncPushBranch(cwd, remote, push_branch)
David James66009462012-03-25 10:08:38 -0700142
143 # Check whether any local changes remain after the sync.
Brian Harring609dc4e2012-05-07 02:17:44 -0700144 if not _DoWeHaveLocalCommits(stable_branch, push_branch, cwd):
145 cros_build_lib.Info('All changes already pushed for %s. Exiting', cwd)
David James66009462012-03-25 10:08:38 -0700146 return
147
David James67d73252013-09-19 17:33:12 -0700148 description = git.RunGit(cwd,
149 ['log', '--format=format:%s%n%n%b', '%s..%s' % (
150 push_branch, stable_branch)]).output
Chris Sosadad0d322011-01-31 16:37:33 -0800151 description = 'Marking set of ebuilds as stable\n\n%s' % description
Brian Harring609dc4e2012-05-07 02:17:44 -0700152 cros_build_lib.Info('For %s, using description %s', cwd, description)
David James97d95872012-11-16 15:09:56 -0800153 git.CreatePushBranch(constants.MERGE_BRANCH, cwd)
154 git.RunGit(cwd, ['merge', '--squash', stable_branch])
155 git.RunGit(cwd, ['commit', '-m', description])
156 git.RunGit(cwd, ['config', 'push.default', 'tracking'])
157 git.PushWithRetry(constants.MERGE_BRANCH, cwd, dryrun=dryrun)
Chris Sosadad0d322011-01-31 16:37:33 -0800158
159
160class GitBranch(object):
161 """Wrapper class for a git branch."""
162
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400163 def __init__(self, branch_name, tracking_branch, cwd):
David Jamesc7c4ff52013-09-18 17:57:13 -0700164 """Sets up variables but does not create the branch.
165
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400166 Args:
David Jamesc7c4ff52013-09-18 17:57:13 -0700167 branch_name: The name of the branch.
168 tracking_branch: The associated tracking branch.
169 cwd: The git repository to work in.
170 """
Chris Sosadad0d322011-01-31 16:37:33 -0800171 self.branch_name = branch_name
172 self.tracking_branch = tracking_branch
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400173 self.cwd = cwd
Chris Sosadad0d322011-01-31 16:37:33 -0800174
175 def CreateBranch(self):
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400176 self.Checkout()
Chris Sosadad0d322011-01-31 16:37:33 -0800177
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400178 def Checkout(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800179 """Function used to check out to another GitBranch."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400180 if not branch:
181 branch = self.branch_name
182 if branch == self.tracking_branch or self.Exists(branch):
183 git_cmd = ['git', 'checkout', '-f', branch]
Chris Sosadad0d322011-01-31 16:37:33 -0800184 else:
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400185 git_cmd = ['repo', 'start', branch, '.']
186 cros_build_lib.RunCommandCaptureOutput(git_cmd, print_cmd=False,
187 cwd=self.cwd)
Chris Sosadad0d322011-01-31 16:37:33 -0800188
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400189 def Exists(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800190 """Returns True if the branch exists."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400191 if not branch:
192 branch = self.branch_name
David James67d73252013-09-19 17:33:12 -0700193 branches = git.RunGit(self.cwd, ['branch']).output
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400194 return branch in branches.split()
Chris Sosadad0d322011-01-31 16:37:33 -0800195
196
David James1b363582012-12-17 11:53:11 -0800197def main(_argv):
Chris Sosa62ad8522011-03-08 17:46:17 -0800198 parser = optparse.OptionParser('cros_mark_as_stable OPTIONS packages')
199 parser.add_option('--all', action='store_true',
200 help='Mark all packages as stable.')
Mike Frysinger587bd562012-11-19 16:41:39 -0500201 parser.add_option('-b', '--boards', default='',
David Jamescc09c9b2012-01-26 22:10:13 -0800202 help='Colon-separated list of boards')
Chris Sosa62ad8522011-03-08 17:46:17 -0800203 parser.add_option('--drop_file',
204 help='File to list packages that were revved.')
205 parser.add_option('--dryrun', action='store_true',
206 help='Passes dry-run to git push if pushing a change.')
207 parser.add_option('-o', '--overlays',
208 help='Colon-separated list of overlays to modify.')
209 parser.add_option('-p', '--packages',
210 help='Colon separated list of packages to rev.')
211 parser.add_option('-r', '--srcroot',
Mike Frysingerfddaeb52012-11-20 11:17:31 -0500212 default=os.path.join(constants.SOURCE_ROOT, 'src'),
Chris Sosa62ad8522011-03-08 17:46:17 -0800213 help='Path to root src directory.')
Chris Sosa62ad8522011-03-08 17:46:17 -0800214 parser.add_option('--verbose', action='store_true',
215 help='Prints out debug info.')
216 (options, args) = parser.parse_args()
Chris Sosadad0d322011-01-31 16:37:33 -0800217
J. Richard Barnette2fa9fd62011-12-02 17:10:10 -0800218 portage_utilities.EBuild.VERBOSE = options.verbose
Chris Sosa62ad8522011-03-08 17:46:17 -0800219
220 if len(args) != 1:
Ryan Cui05a31ba2011-05-31 17:47:37 -0700221 _PrintUsageAndDie('Must specify a valid command [commit, push]')
Chris Sosa62ad8522011-03-08 17:46:17 -0800222
223 command = args[0]
224 package_list = None
225 if options.packages:
226 package_list = options.packages.split(':')
227
David James1b363582012-12-17 11:53:11 -0800228 _CheckSaneArguments(command, options)
Chris Sosa62ad8522011-03-08 17:46:17 -0800229 if options.overlays:
Chris Sosadad0d322011-01-31 16:37:33 -0800230 overlays = {}
Chris Sosa62ad8522011-03-08 17:46:17 -0800231 for path in options.overlays.split(':'):
Ryan Cui05a31ba2011-05-31 17:47:37 -0700232 if not os.path.isdir(path):
Chris Sosac13bba52011-05-24 15:14:09 -0700233 cros_build_lib.Die('Cannot find overlay: %s' % path)
Chris Sosadad0d322011-01-31 16:37:33 -0800234 overlays[path] = []
235 else:
Chris Sosac13bba52011-05-24 15:14:09 -0700236 cros_build_lib.Warning('Missing --overlays argument')
Chris Sosadad0d322011-01-31 16:37:33 -0800237 overlays = {
Chris Sosa62ad8522011-03-08 17:46:17 -0800238 '%s/private-overlays/chromeos-overlay' % options.srcroot: [],
239 '%s/third_party/chromiumos-overlay' % options.srcroot: []
Chris Sosadad0d322011-01-31 16:37:33 -0800240 }
241
David James97d95872012-11-16 15:09:56 -0800242 manifest = git.ManifestCheckout.Cached(options.srcroot)
Ryan Cui4656a3c2011-05-24 12:30:30 -0700243
David James84e953c2013-04-23 18:44:06 -0700244 if command == 'commit':
245 portage_utilities.BuildEBuildDictionary(overlays, options.all, package_list)
246
David James15ed1302013-04-25 09:21:19 -0700247 # Contains the array of packages we actually revved.
248 revved_packages = []
249 new_package_atoms = []
David Jamesa8457b52011-05-28 00:03:20 -0700250
David James15ed1302013-04-25 09:21:19 -0700251 # Slight optimization hack: process the chromiumos overlay before any other
252 # cros-workon overlay first so we can do background cache generation in it.
253 # A perfect solution would walk all the overlays, figure out any dependencies
254 # between them (with layout.conf), and then process them in dependency order.
255 # However, this operation isn't slow enough to warrant that level of
256 # complexity, so we'll just special case the main overlay.
257 #
258 # Similarly, generate the cache in the portage-stable tree asap. We know
259 # we won't have any cros-workon packages in there, so generating the cache
260 # is the only thing it'll be doing. The chromiumos overlay instead might
261 # have revbumping to do before it can generate the cache.
262 keys = overlays.keys()
263 for overlay in ('/third_party/chromiumos-overlay',
264 '/third_party/portage-stable'):
265 for k in keys:
266 if k.endswith(overlay):
267 keys.remove(k)
268 keys.insert(0, k)
269 break
Chris Sosadad0d322011-01-31 16:37:33 -0800270
David James15ed1302013-04-25 09:21:19 -0700271 with parallel.BackgroundTaskRunner(portage_utilities.RegenCache) as queue:
272 for overlay in keys:
273 ebuilds = overlays[overlay]
274 if not os.path.isdir(overlay):
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400275 cros_build_lib.Warning('Skipping %s' % overlay)
David James15ed1302013-04-25 09:21:19 -0700276 continue
Chris Sosadad0d322011-01-31 16:37:33 -0800277
David James15ed1302013-04-25 09:21:19 -0700278 # Note we intentionally work from the non push tracking branch;
279 # everything built thus far has been against it (meaning, http mirrors),
280 # thus we should honor that. During the actual push, the code switches
281 # to the correct urls, and does an appropriate rebasing.
282 tracking_branch = git.GetTrackingBranchViaManifest(
283 overlay, manifest=manifest)[1]
Brian Harring609dc4e2012-05-07 02:17:44 -0700284
David James15ed1302013-04-25 09:21:19 -0700285 if command == 'push':
286 PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch,
287 options.dryrun, cwd=overlay)
288 elif command == 'commit':
289 existing_branch = git.GetCurrentBranch(overlay)
290 work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch,
291 cwd=overlay)
292 work_branch.CreateBranch()
293 if not work_branch.Exists():
294 cros_build_lib.Die('Unable to create stabilizing branch in %s' %
295 overlay)
296
297 # In the case of uprevving overlays that have patches applied to them,
298 # include the patched changes in the stabilizing branch.
299 if existing_branch:
David James67d73252013-09-19 17:33:12 -0700300 git.RunGit(overlay, ['rebase', existing_branch])
David James15ed1302013-04-25 09:21:19 -0700301
302 messages = []
303 for ebuild in ebuilds:
304 if options.verbose:
305 cros_build_lib.Info('Working on %s', ebuild.package)
306 try:
307 new_package = ebuild.RevWorkOnEBuild(options.srcroot, manifest)
308 if new_package:
309 revved_packages.append(ebuild.package)
310 new_package_atoms.append('=%s' % new_package)
311 messages.append(_GIT_COMMIT_MESSAGE % ebuild.package)
312 except (OSError, IOError):
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400313 cros_build_lib.Warning(
314 'Cannot rev %s\n'
315 'Note you will have to go into %s '
316 'and reset the git repo yourself.' % (ebuild.package, overlay))
David James15ed1302013-04-25 09:21:19 -0700317 raise
318
319 if messages:
320 portage_utilities.EBuild.CommitChange('\n\n'.join(messages), overlay)
321
322 if cros_build_lib.IsInsideChroot():
323 # Regenerate caches if need be. We do this all the time to
324 # catch when users make changes without updating cache files.
325 queue.put([overlay])
326
327 if command == 'commit':
328 if cros_build_lib.IsInsideChroot():
329 CleanStalePackages(options.boards.split(':'), new_package_atoms)
330 if options.drop_file:
331 osutils.WriteFile(options.drop_file, ' '.join(revved_packages))