blob: a97c578f0df5b23439775e0b922ad3559856aa9f [file] [log] [blame]
Mike Frysinger110750a2012-03-26 14:19:20 -04001# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
Chris Sosadad0d322011-01-31 16:37:33 -08002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
4
5"""This module uprevs a given package's ebuild to the next revision."""
6
Mike Frysinger383367e2014-09-16 15:06:17 -04007from __future__ import print_function
8
Chris Sosadad0d322011-01-31 16:37:33 -08009import os
Chris Sosadad0d322011-01-31 16:37:33 -080010
Don Garrett88b8d782014-05-13 17:30:55 -070011from chromite.cbuildbot import constants
Mike Frysingere8dcbfd2015-03-08 21:45:52 -040012from chromite.lib import commandline
Chris Sosac13bba52011-05-24 15:14:09 -070013from chromite.lib import cros_build_lib
Ralph Nathan03047282015-03-23 11:09:32 -070014from chromite.lib import cros_logging as logging
David James97d95872012-11-16 15:09:56 -080015from chromite.lib import git
Mike Frysingerfddaeb52012-11-20 11:17:31 -050016from chromite.lib import osutils
David James6450a0a2012-12-04 07:59:53 -080017from chromite.lib import parallel
Alex Deymo075c2292014-09-04 18:31:50 -070018from chromite.lib import portage_util
Chris Sosac13bba52011-05-24 15:14:09 -070019
Gabe Black71e963e2014-10-28 20:19:59 -070020# Commit message subject for uprevving Portage packages.
21GIT_COMMIT_SUBJECT = 'Marking set of ebuilds as stable'
David James15ed1302013-04-25 09:21:19 -070022
David James29e86d52013-04-19 09:41:29 -070023# Commit message for uprevving Portage packages.
24_GIT_COMMIT_MESSAGE = 'Marking 9999 ebuild for %s as stable.'
25
Chris Sosadad0d322011-01-31 16:37:33 -080026# Dictionary of valid commands with usage information.
27COMMAND_DICTIONARY = {
Mike Frysinger5cd8c742013-10-11 14:43:01 -040028 'commit': 'Marks given ebuilds as stable locally',
29 'push': 'Pushes previous marking of ebuilds to remote repo',
30}
Chris Sosadad0d322011-01-31 16:37:33 -080031
Chris Sosadad0d322011-01-31 16:37:33 -080032
Chris Sosadad0d322011-01-31 16:37:33 -080033# ======================= Global Helper Functions ========================
34
35
David James41124af2015-06-04 21:13:25 -070036def CleanStalePackages(srcroot, boards, package_atoms):
Chris Sosabf153872011-04-28 14:21:09 -070037 """Cleans up stale package info from a previous build.
Mike Frysinger5cd8c742013-10-11 14:43:01 -040038
Chris Sosabf153872011-04-28 14:21:09 -070039 Args:
David James41124af2015-06-04 21:13:25 -070040 srcroot: Root directory of the source tree.
David Jamescc09c9b2012-01-26 22:10:13 -080041 boards: Boards to clean the packages from.
Mike Frysingerde5ab0e2013-03-21 20:48:36 -040042 package_atoms: A list of package atoms to unmerge.
Chris Sosabf153872011-04-28 14:21:09 -070043 """
David James15ed1302013-04-25 09:21:19 -070044 if package_atoms:
Ralph Nathan03047282015-03-23 11:09:32 -070045 logging.info('Cleaning up stale packages %s.' % package_atoms)
David James15ed1302013-04-25 09:21:19 -070046
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040047 # First unmerge all the packages for a board, then eclean it.
48 # We need these two steps to run in order (unmerge/eclean),
49 # but we can let all the boards run in parallel.
50 def _CleanStalePackages(board):
51 if board:
52 suffix = '-' + board
53 runcmd = cros_build_lib.RunCommand
54 else:
55 suffix = ''
56 runcmd = cros_build_lib.SudoRunCommand
Chris Sosadad0d322011-01-31 16:37:33 -080057
David James59a0a2b2013-03-22 14:04:44 -070058 emerge, eclean = 'emerge' + suffix, 'eclean' + suffix
59 if not osutils.FindMissingBinaries([emerge, eclean]):
David James63841a82014-01-16 14:39:24 -080060 if package_atoms:
61 # If nothing was found to be unmerged, emerge will exit(1).
62 result = runcmd([emerge, '-q', '--unmerge'] + package_atoms,
David James41124af2015-06-04 21:13:25 -070063 enter_chroot=True, extra_env={'CLEAN_DELAY': '0'},
64 error_code_ok=True, cwd=srcroot)
David James63841a82014-01-16 14:39:24 -080065 if not result.returncode in (0, 1):
66 raise cros_build_lib.RunCommandError('unexpected error', result)
David James59a0a2b2013-03-22 14:04:44 -070067 runcmd([eclean, '-d', 'packages'],
David James41124af2015-06-04 21:13:25 -070068 cwd=srcroot, enter_chroot=True,
David James59a0a2b2013-03-22 14:04:44 -070069 redirect_stdout=True, redirect_stderr=True)
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040070
71 tasks = []
David Jamescc09c9b2012-01-26 22:10:13 -080072 for board in boards:
Mike Frysingerb7ab9b82012-04-04 16:22:43 -040073 tasks.append([board])
74 tasks.append([None])
75
David James6450a0a2012-12-04 07:59:53 -080076 parallel.RunTasksInProcessPool(_CleanStalePackages, tasks)
Chris Sosadad0d322011-01-31 16:37:33 -080077
78
Mike Frysinger2ebe3732012-05-08 17:04:12 -040079# TODO(build): This code needs to be gutted and rebased to cros_build_lib.
80def _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
Chris Sosadad0d322011-01-31 16:37:33 -080081 """Returns true if there are local commits."""
David James97d95872012-11-16 15:09:56 -080082 output = git.RunGit(
Paul Hobbs72d8e392015-10-21 17:24:23 -070083 cwd, ['rev-parse', stable_branch, tracking_branch]).output.split()
Brian Harring5b86b5e2012-05-25 18:27:40 -070084 return output[0] != output[1]
Chris Sosadad0d322011-01-31 16:37:33 -080085
86
Chris Sosadad0d322011-01-31 16:37:33 -080087# ======================= End Global Helper Functions ========================
88
89
Mike Frysinger2ebe3732012-05-08 17:04:12 -040090def PushChange(stable_branch, tracking_branch, dryrun, cwd):
Chris Sosadad0d322011-01-31 16:37:33 -080091 """Pushes commits in the stable_branch to the remote git repository.
92
David Jamesee2da622012-02-23 09:32:16 -080093 Pushes local commits from calls to CommitChange to the remote git
David James66009462012-03-25 10:08:38 -070094 repository specified by current working directory. If changes are
95 found to commit, they will be merged to the merge branch and pushed.
96 In that case, the local repository will be left on the merge branch.
Chris Sosadad0d322011-01-31 16:37:33 -080097
98 Args:
99 stable_branch: The local branch with commits we want to push.
100 tracking_branch: The tracking branch of the local branch.
Chris Sosa62ad8522011-03-08 17:46:17 -0800101 dryrun: Use git push --dryrun to emulate a push.
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400102 cwd: The directory to run commands in.
Mike Frysinger1a736a82013-12-12 01:50:59 -0500103
Chris Sosadad0d322011-01-31 16:37:33 -0800104 Raises:
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400105 OSError: Error occurred while pushing.
Chris Sosadad0d322011-01-31 16:37:33 -0800106 """
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400107 if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd):
Ralph Nathan03047282015-03-23 11:09:32 -0700108 logging.info('No work found to push in %s. Exiting', cwd)
Chris Sosadad0d322011-01-31 16:37:33 -0800109 return
110
David James66009462012-03-25 10:08:38 -0700111 # For the commit queue, our local branch may contain commits that were
112 # just tested and pushed during the CommitQueueCompletion stage. Sync
113 # and rebase our local branch on top of the remote commits.
Paul Hobbs72d8e392015-10-21 17:24:23 -0700114 remote_ref = git.GetTrackingBranch(cwd,
115 branch=stable_branch,
116 for_push=True)
Don Garrett99449592015-03-25 11:01:30 -0700117 git.SyncPushBranch(cwd, remote_ref.remote, remote_ref.ref)
David James66009462012-03-25 10:08:38 -0700118
119 # Check whether any local changes remain after the sync.
Don Garrett99449592015-03-25 11:01:30 -0700120 if not _DoWeHaveLocalCommits(stable_branch, remote_ref.ref, cwd):
Ralph Nathan03047282015-03-23 11:09:32 -0700121 logging.info('All changes already pushed for %s. Exiting', cwd)
David James66009462012-03-25 10:08:38 -0700122 return
123
Matt Tennantcb522052013-11-25 14:23:43 -0800124 # Add a failsafe check here. Only CLs from the 'chrome-bot' user should
125 # be involved here. If any other CLs are found then complain.
126 # In dryruns extra CLs are normal, though, and can be ignored.
127 bad_cl_cmd = ['log', '--format=short', '--perl-regexp',
128 '--author', '^(?!chrome-bot)', '%s..%s' % (
Don Garrett99449592015-03-25 11:01:30 -0700129 remote_ref.ref, stable_branch)]
Matt Tennantcb522052013-11-25 14:23:43 -0800130 bad_cls = git.RunGit(cwd, bad_cl_cmd).output
131 if bad_cls.strip() and not dryrun:
Ralph Nathan59900422015-03-24 10:41:17 -0700132 logging.error('The Uprev stage found changes from users other than '
133 'chrome-bot:\n\n%s', bad_cls)
Matt Tennantcb522052013-11-25 14:23:43 -0800134 raise AssertionError('Unexpected CLs found during uprev stage.')
135
Mike Frysingere65f3752014-12-08 00:46:39 -0500136 description = git.RunGit(
137 cwd,
138 ['log', '--format=format:%s%n%n%b',
Don Garrett99449592015-03-25 11:01:30 -0700139 '%s..%s' % (remote_ref.ref, stable_branch)]).output
Gabe Black71e963e2014-10-28 20:19:59 -0700140 description = '%s\n\n%s' % (GIT_COMMIT_SUBJECT, description)
Ralph Nathan03047282015-03-23 11:09:32 -0700141 logging.info('For %s, using description %s', cwd, description)
David James97d95872012-11-16 15:09:56 -0800142 git.CreatePushBranch(constants.MERGE_BRANCH, cwd)
143 git.RunGit(cwd, ['merge', '--squash', stable_branch])
144 git.RunGit(cwd, ['commit', '-m', description])
145 git.RunGit(cwd, ['config', 'push.default', 'tracking'])
146 git.PushWithRetry(constants.MERGE_BRANCH, cwd, dryrun=dryrun)
Chris Sosadad0d322011-01-31 16:37:33 -0800147
148
149class GitBranch(object):
150 """Wrapper class for a git branch."""
151
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400152 def __init__(self, branch_name, tracking_branch, cwd):
David Jamesc7c4ff52013-09-18 17:57:13 -0700153 """Sets up variables but does not create the branch.
154
Mike Frysinger5cd8c742013-10-11 14:43:01 -0400155 Args:
David Jamesc7c4ff52013-09-18 17:57:13 -0700156 branch_name: The name of the branch.
157 tracking_branch: The associated tracking branch.
158 cwd: The git repository to work in.
159 """
Chris Sosadad0d322011-01-31 16:37:33 -0800160 self.branch_name = branch_name
161 self.tracking_branch = tracking_branch
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400162 self.cwd = cwd
Chris Sosadad0d322011-01-31 16:37:33 -0800163
164 def CreateBranch(self):
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400165 self.Checkout()
Chris Sosadad0d322011-01-31 16:37:33 -0800166
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400167 def Checkout(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800168 """Function used to check out to another GitBranch."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400169 if not branch:
170 branch = self.branch_name
171 if branch == self.tracking_branch or self.Exists(branch):
172 git_cmd = ['git', 'checkout', '-f', branch]
Chris Sosadad0d322011-01-31 16:37:33 -0800173 else:
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400174 git_cmd = ['repo', 'start', branch, '.']
Yu-Ju Hong3add4432014-01-30 11:46:15 -0800175 cros_build_lib.RunCommand(git_cmd, print_cmd=False, cwd=self.cwd,
176 capture_output=True)
Chris Sosadad0d322011-01-31 16:37:33 -0800177
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400178 def Exists(self, branch=None):
Chris Sosadad0d322011-01-31 16:37:33 -0800179 """Returns True if the branch exists."""
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400180 if not branch:
181 branch = self.branch_name
David James67d73252013-09-19 17:33:12 -0700182 branches = git.RunGit(self.cwd, ['branch']).output
Mike Frysinger2ebe3732012-05-08 17:04:12 -0400183 return branch in branches.split()
Chris Sosadad0d322011-01-31 16:37:33 -0800184
185
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400186def GetParser():
187 """Creates the argparse parser."""
188 parser = commandline.ArgumentParser()
189 parser.add_argument('--all', action='store_true',
190 help='Mark all packages as stable.')
191 parser.add_argument('-b', '--boards', default='',
192 help='Colon-separated list of boards.')
193 parser.add_argument('--drop_file',
194 help='File to list packages that were revved.')
195 parser.add_argument('--dryrun', action='store_true',
196 help='Passes dry-run to git push if pushing a change.')
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700197 parser.add_argument('--force', action='store_true',
198 help='Force the stabilization of blacklisted packages. '
199 '(only compatible with -p)')
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400200 parser.add_argument('-o', '--overlays',
201 help='Colon-separated list of overlays to modify.')
202 parser.add_argument('-p', '--packages',
203 help='Colon separated list of packages to rev.')
204 parser.add_argument('-r', '--srcroot', type='path',
205 default=os.path.join(constants.SOURCE_ROOT, 'src'),
206 help='Path to root src directory.')
207 parser.add_argument('--verbose', action='store_true',
208 help='Prints out debug info.')
209 parser.add_argument('command', choices=COMMAND_DICTIONARY.keys(),
210 help='Command to run.')
211 return parser
212
213
214def main(argv):
215 parser = GetParser()
216 options = parser.parse_args(argv)
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700217 options.Freeze()
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400218
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700219 if options.command == 'commit':
220 if not options.packages and not options.all:
221 parser.error('Please specify at least one package (--packages)')
222 if options.force and options.all:
223 parser.error('Cannot use --force with --all. You must specify a list of '
224 'packages you want to force uprev.')
225
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400226 if not os.path.isdir(options.srcroot):
227 parser.error('srcroot is not a valid path: %s' % options.srcroot)
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400228
Alex Deymo075c2292014-09-04 18:31:50 -0700229 portage_util.EBuild.VERBOSE = options.verbose
Chris Sosa62ad8522011-03-08 17:46:17 -0800230
Chris Sosa62ad8522011-03-08 17:46:17 -0800231 package_list = None
232 if options.packages:
233 package_list = options.packages.split(':')
234
Chris Sosa62ad8522011-03-08 17:46:17 -0800235 if options.overlays:
Chris Sosadad0d322011-01-31 16:37:33 -0800236 overlays = {}
Chris Sosa62ad8522011-03-08 17:46:17 -0800237 for path in options.overlays.split(':'):
Ryan Cui05a31ba2011-05-31 17:47:37 -0700238 if not os.path.isdir(path):
Chris Sosac13bba52011-05-24 15:14:09 -0700239 cros_build_lib.Die('Cannot find overlay: %s' % path)
Chris Sosadad0d322011-01-31 16:37:33 -0800240 overlays[path] = []
241 else:
Ralph Nathan446aee92015-03-23 14:44:56 -0700242 logging.warning('Missing --overlays argument')
Chris Sosadad0d322011-01-31 16:37:33 -0800243 overlays = {
Mike Frysingere65f3752014-12-08 00:46:39 -0500244 '%s/private-overlays/chromeos-overlay' % options.srcroot: [],
245 '%s/third_party/chromiumos-overlay' % options.srcroot: [],
Chris Sosadad0d322011-01-31 16:37:33 -0800246 }
247
David James97d95872012-11-16 15:09:56 -0800248 manifest = git.ManifestCheckout.Cached(options.srcroot)
Ryan Cui4656a3c2011-05-24 12:30:30 -0700249
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400250 if options.command == 'commit':
Bertrand SIMONNET6af54302015-08-05 10:12:49 -0700251 portage_util.BuildEBuildDictionary(overlays, options.all, package_list,
252 allow_blacklisted=options.force)
David James84e953c2013-04-23 18:44:06 -0700253
David James15ed1302013-04-25 09:21:19 -0700254 # Contains the array of packages we actually revved.
255 revved_packages = []
256 new_package_atoms = []
David Jamesa8457b52011-05-28 00:03:20 -0700257
David James41124af2015-06-04 21:13:25 -0700258 for overlay in overlays:
259 ebuilds = overlays[overlay]
260 if not os.path.isdir(overlay):
261 logging.warning('Skipping %s' % overlay)
262 continue
Chris Sosadad0d322011-01-31 16:37:33 -0800263
David James41124af2015-06-04 21:13:25 -0700264 # Note we intentionally work from the non push tracking branch;
265 # everything built thus far has been against it (meaning, http mirrors),
266 # thus we should honor that. During the actual push, the code switches
267 # to the correct urls, and does an appropriate rebasing.
268 tracking_branch = git.GetTrackingBranchViaManifest(
269 overlay, manifest=manifest).ref
Chris Sosadad0d322011-01-31 16:37:33 -0800270
David James41124af2015-06-04 21:13:25 -0700271 if options.command == 'push':
272 PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch,
273 options.dryrun, cwd=overlay)
274 elif options.command == 'commit':
275 existing_commit = git.GetGitRepoRevision(overlay)
276 work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch,
277 cwd=overlay)
278 work_branch.CreateBranch()
279 if not work_branch.Exists():
280 cros_build_lib.Die('Unable to create stabilizing branch in %s' %
281 overlay)
Brian Harring609dc4e2012-05-07 02:17:44 -0700282
David James41124af2015-06-04 21:13:25 -0700283 # In the case of uprevving overlays that have patches applied to them,
284 # include the patched changes in the stabilizing branch.
285 git.RunGit(overlay, ['rebase', existing_commit])
David James15ed1302013-04-25 09:21:19 -0700286
David James41124af2015-06-04 21:13:25 -0700287 messages = []
288 for ebuild in ebuilds:
289 if options.verbose:
290 logging.info('Working on %s', ebuild.package)
291 try:
292 new_package = ebuild.RevWorkOnEBuild(options.srcroot, manifest)
293 if new_package:
294 revved_packages.append(ebuild.package)
295 new_package_atoms.append('=%s' % new_package)
296 messages.append(_GIT_COMMIT_MESSAGE % ebuild.package)
297 except (OSError, IOError):
298 logging.warning(
299 'Cannot rev %s\n'
300 'Note you will have to go into %s '
301 'and reset the git repo yourself.' % (ebuild.package, overlay))
302 raise
David James15ed1302013-04-25 09:21:19 -0700303
David James41124af2015-06-04 21:13:25 -0700304 if messages:
305 portage_util.EBuild.CommitChange('\n\n'.join(messages), overlay)
David James15ed1302013-04-25 09:21:19 -0700306
Mike Frysingere8dcbfd2015-03-08 21:45:52 -0400307 if options.command == 'commit':
David James41124af2015-06-04 21:13:25 -0700308 chroot_path = os.path.join(options.srcroot, constants.DEFAULT_CHROOT_DIR)
309 if os.path.exists(chroot_path):
310 CleanStalePackages(options.srcroot, options.boards.split(':'),
311 new_package_atoms)
David James15ed1302013-04-25 09:21:19 -0700312 if options.drop_file:
313 osutils.WriteFile(options.drop_file, ' '.join(revved_packages))