Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 1 | # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 2 | # 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 Frysinger | 383367e | 2014-09-16 15:06:17 -0400 | [diff] [blame] | 7 | from __future__ import print_function |
| 8 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 9 | import os |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 10 | |
Don Garrett | 88b8d78 | 2014-05-13 17:30:55 -0700 | [diff] [blame] | 11 | from chromite.cbuildbot import constants |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 12 | from chromite.lib import commandline |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 13 | from chromite.lib import cros_build_lib |
Ralph Nathan | 0304728 | 2015-03-23 11:09:32 -0700 | [diff] [blame] | 14 | from chromite.lib import cros_logging as logging |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 15 | from chromite.lib import git |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 16 | from chromite.lib import osutils |
David James | 6450a0a | 2012-12-04 07:59:53 -0800 | [diff] [blame] | 17 | from chromite.lib import parallel |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 18 | from chromite.lib import portage_util |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 19 | |
Gabe Black | 71e963e | 2014-10-28 20:19:59 -0700 | [diff] [blame] | 20 | # Commit message subject for uprevving Portage packages. |
| 21 | GIT_COMMIT_SUBJECT = 'Marking set of ebuilds as stable' |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 22 | |
David James | 29e86d5 | 2013-04-19 09:41:29 -0700 | [diff] [blame] | 23 | # Commit message for uprevving Portage packages. |
| 24 | _GIT_COMMIT_MESSAGE = 'Marking 9999 ebuild for %s as stable.' |
| 25 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 26 | # Dictionary of valid commands with usage information. |
| 27 | COMMAND_DICTIONARY = { |
Mike Frysinger | 5cd8c74 | 2013-10-11 14:43:01 -0400 | [diff] [blame] | 28 | 'commit': 'Marks given ebuilds as stable locally', |
| 29 | 'push': 'Pushes previous marking of ebuilds to remote repo', |
| 30 | } |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 31 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 32 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 33 | # ======================= Global Helper Functions ======================== |
| 34 | |
| 35 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 36 | def CleanStalePackages(srcroot, boards, package_atoms): |
Chris Sosa | bf15387 | 2011-04-28 14:21:09 -0700 | [diff] [blame] | 37 | """Cleans up stale package info from a previous build. |
Mike Frysinger | 5cd8c74 | 2013-10-11 14:43:01 -0400 | [diff] [blame] | 38 | |
Chris Sosa | bf15387 | 2011-04-28 14:21:09 -0700 | [diff] [blame] | 39 | Args: |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 40 | srcroot: Root directory of the source tree. |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 41 | boards: Boards to clean the packages from. |
Mike Frysinger | de5ab0e | 2013-03-21 20:48:36 -0400 | [diff] [blame] | 42 | package_atoms: A list of package atoms to unmerge. |
Chris Sosa | bf15387 | 2011-04-28 14:21:09 -0700 | [diff] [blame] | 43 | """ |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 44 | if package_atoms: |
Ralph Nathan | 0304728 | 2015-03-23 11:09:32 -0700 | [diff] [blame] | 45 | logging.info('Cleaning up stale packages %s.' % package_atoms) |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 46 | |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 47 | # 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 Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 57 | |
David James | 59a0a2b | 2013-03-22 14:04:44 -0700 | [diff] [blame] | 58 | emerge, eclean = 'emerge' + suffix, 'eclean' + suffix |
| 59 | if not osutils.FindMissingBinaries([emerge, eclean]): |
David James | 63841a8 | 2014-01-16 14:39:24 -0800 | [diff] [blame] | 60 | if package_atoms: |
| 61 | # If nothing was found to be unmerged, emerge will exit(1). |
| 62 | result = runcmd([emerge, '-q', '--unmerge'] + package_atoms, |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 63 | enter_chroot=True, extra_env={'CLEAN_DELAY': '0'}, |
| 64 | error_code_ok=True, cwd=srcroot) |
David James | 63841a8 | 2014-01-16 14:39:24 -0800 | [diff] [blame] | 65 | if not result.returncode in (0, 1): |
| 66 | raise cros_build_lib.RunCommandError('unexpected error', result) |
David James | 59a0a2b | 2013-03-22 14:04:44 -0700 | [diff] [blame] | 67 | runcmd([eclean, '-d', 'packages'], |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 68 | cwd=srcroot, enter_chroot=True, |
David James | 59a0a2b | 2013-03-22 14:04:44 -0700 | [diff] [blame] | 69 | redirect_stdout=True, redirect_stderr=True) |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 70 | |
| 71 | tasks = [] |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 72 | for board in boards: |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 73 | tasks.append([board]) |
| 74 | tasks.append([None]) |
| 75 | |
David James | 6450a0a | 2012-12-04 07:59:53 -0800 | [diff] [blame] | 76 | parallel.RunTasksInProcessPool(_CleanStalePackages, tasks) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 77 | |
| 78 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 79 | # TODO(build): This code needs to be gutted and rebased to cros_build_lib. |
| 80 | def _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 81 | """Returns true if there are local commits.""" |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 82 | output = git.RunGit( |
Paul Hobbs | 72d8e39 | 2015-10-21 17:24:23 -0700 | [diff] [blame] | 83 | cwd, ['rev-parse', stable_branch, tracking_branch]).output.split() |
Brian Harring | 5b86b5e | 2012-05-25 18:27:40 -0700 | [diff] [blame] | 84 | return output[0] != output[1] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 85 | |
| 86 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 87 | # ======================= End Global Helper Functions ======================== |
| 88 | |
| 89 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 90 | def PushChange(stable_branch, tracking_branch, dryrun, cwd): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 91 | """Pushes commits in the stable_branch to the remote git repository. |
| 92 | |
David James | ee2da62 | 2012-02-23 09:32:16 -0800 | [diff] [blame] | 93 | Pushes local commits from calls to CommitChange to the remote git |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 94 | 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 Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 97 | |
| 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 Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 101 | dryrun: Use git push --dryrun to emulate a push. |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 102 | cwd: The directory to run commands in. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 103 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 104 | Raises: |
Mike Frysinger | 5cd8c74 | 2013-10-11 14:43:01 -0400 | [diff] [blame] | 105 | OSError: Error occurred while pushing. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 106 | """ |
David James | 4795963 | 2015-10-23 07:56:01 -0700 | [diff] [blame^] | 107 | if not git.DoesCommitExistInRepo(cwd, stable_branch): |
| 108 | logging.debug('No branch created for %s. Exiting', cwd) |
| 109 | return |
| 110 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 111 | if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd): |
David James | 4795963 | 2015-10-23 07:56:01 -0700 | [diff] [blame^] | 112 | logging.debug('No work found to push in %s. Exiting', cwd) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 113 | return |
| 114 | |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 115 | # For the commit queue, our local branch may contain commits that were |
| 116 | # just tested and pushed during the CommitQueueCompletion stage. Sync |
| 117 | # and rebase our local branch on top of the remote commits. |
Paul Hobbs | 72d8e39 | 2015-10-21 17:24:23 -0700 | [diff] [blame] | 118 | remote_ref = git.GetTrackingBranch(cwd, |
| 119 | branch=stable_branch, |
| 120 | for_push=True) |
Don Garrett | 9944959 | 2015-03-25 11:01:30 -0700 | [diff] [blame] | 121 | git.SyncPushBranch(cwd, remote_ref.remote, remote_ref.ref) |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 122 | |
| 123 | # Check whether any local changes remain after the sync. |
Don Garrett | 9944959 | 2015-03-25 11:01:30 -0700 | [diff] [blame] | 124 | if not _DoWeHaveLocalCommits(stable_branch, remote_ref.ref, cwd): |
Ralph Nathan | 0304728 | 2015-03-23 11:09:32 -0700 | [diff] [blame] | 125 | logging.info('All changes already pushed for %s. Exiting', cwd) |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 126 | return |
| 127 | |
Matt Tennant | cb52205 | 2013-11-25 14:23:43 -0800 | [diff] [blame] | 128 | # Add a failsafe check here. Only CLs from the 'chrome-bot' user should |
| 129 | # be involved here. If any other CLs are found then complain. |
| 130 | # In dryruns extra CLs are normal, though, and can be ignored. |
| 131 | bad_cl_cmd = ['log', '--format=short', '--perl-regexp', |
| 132 | '--author', '^(?!chrome-bot)', '%s..%s' % ( |
Don Garrett | 9944959 | 2015-03-25 11:01:30 -0700 | [diff] [blame] | 133 | remote_ref.ref, stable_branch)] |
Matt Tennant | cb52205 | 2013-11-25 14:23:43 -0800 | [diff] [blame] | 134 | bad_cls = git.RunGit(cwd, bad_cl_cmd).output |
| 135 | if bad_cls.strip() and not dryrun: |
Ralph Nathan | 5990042 | 2015-03-24 10:41:17 -0700 | [diff] [blame] | 136 | logging.error('The Uprev stage found changes from users other than ' |
| 137 | 'chrome-bot:\n\n%s', bad_cls) |
Matt Tennant | cb52205 | 2013-11-25 14:23:43 -0800 | [diff] [blame] | 138 | raise AssertionError('Unexpected CLs found during uprev stage.') |
| 139 | |
Mike Frysinger | e65f375 | 2014-12-08 00:46:39 -0500 | [diff] [blame] | 140 | description = git.RunGit( |
| 141 | cwd, |
| 142 | ['log', '--format=format:%s%n%n%b', |
Don Garrett | 9944959 | 2015-03-25 11:01:30 -0700 | [diff] [blame] | 143 | '%s..%s' % (remote_ref.ref, stable_branch)]).output |
Gabe Black | 71e963e | 2014-10-28 20:19:59 -0700 | [diff] [blame] | 144 | description = '%s\n\n%s' % (GIT_COMMIT_SUBJECT, description) |
Ralph Nathan | 0304728 | 2015-03-23 11:09:32 -0700 | [diff] [blame] | 145 | logging.info('For %s, using description %s', cwd, description) |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 146 | git.CreatePushBranch(constants.MERGE_BRANCH, cwd) |
| 147 | git.RunGit(cwd, ['merge', '--squash', stable_branch]) |
| 148 | git.RunGit(cwd, ['commit', '-m', description]) |
| 149 | git.RunGit(cwd, ['config', 'push.default', 'tracking']) |
| 150 | git.PushWithRetry(constants.MERGE_BRANCH, cwd, dryrun=dryrun) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 151 | |
| 152 | |
| 153 | class GitBranch(object): |
| 154 | """Wrapper class for a git branch.""" |
| 155 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 156 | def __init__(self, branch_name, tracking_branch, cwd): |
David James | c7c4ff5 | 2013-09-18 17:57:13 -0700 | [diff] [blame] | 157 | """Sets up variables but does not create the branch. |
| 158 | |
Mike Frysinger | 5cd8c74 | 2013-10-11 14:43:01 -0400 | [diff] [blame] | 159 | Args: |
David James | c7c4ff5 | 2013-09-18 17:57:13 -0700 | [diff] [blame] | 160 | branch_name: The name of the branch. |
| 161 | tracking_branch: The associated tracking branch. |
| 162 | cwd: The git repository to work in. |
| 163 | """ |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 164 | self.branch_name = branch_name |
| 165 | self.tracking_branch = tracking_branch |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 166 | self.cwd = cwd |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 167 | |
| 168 | def CreateBranch(self): |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 169 | self.Checkout() |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 170 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 171 | def Checkout(self, branch=None): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 172 | """Function used to check out to another GitBranch.""" |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 173 | if not branch: |
| 174 | branch = self.branch_name |
| 175 | if branch == self.tracking_branch or self.Exists(branch): |
| 176 | git_cmd = ['git', 'checkout', '-f', branch] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 177 | else: |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 178 | git_cmd = ['repo', 'start', branch, '.'] |
Yu-Ju Hong | 3add443 | 2014-01-30 11:46:15 -0800 | [diff] [blame] | 179 | cros_build_lib.RunCommand(git_cmd, print_cmd=False, cwd=self.cwd, |
| 180 | capture_output=True) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 181 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 182 | def Exists(self, branch=None): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 183 | """Returns True if the branch exists.""" |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 184 | if not branch: |
| 185 | branch = self.branch_name |
David James | 67d7325 | 2013-09-19 17:33:12 -0700 | [diff] [blame] | 186 | branches = git.RunGit(self.cwd, ['branch']).output |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 187 | return branch in branches.split() |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 188 | |
| 189 | |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 190 | def GetParser(): |
| 191 | """Creates the argparse parser.""" |
| 192 | parser = commandline.ArgumentParser() |
| 193 | parser.add_argument('--all', action='store_true', |
| 194 | help='Mark all packages as stable.') |
| 195 | parser.add_argument('-b', '--boards', default='', |
| 196 | help='Colon-separated list of boards.') |
| 197 | parser.add_argument('--drop_file', |
| 198 | help='File to list packages that were revved.') |
| 199 | parser.add_argument('--dryrun', action='store_true', |
| 200 | help='Passes dry-run to git push if pushing a change.') |
Bertrand SIMONNET | 6af5430 | 2015-08-05 10:12:49 -0700 | [diff] [blame] | 201 | parser.add_argument('--force', action='store_true', |
| 202 | help='Force the stabilization of blacklisted packages. ' |
| 203 | '(only compatible with -p)') |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 204 | parser.add_argument('-o', '--overlays', |
| 205 | help='Colon-separated list of overlays to modify.') |
| 206 | parser.add_argument('-p', '--packages', |
| 207 | help='Colon separated list of packages to rev.') |
| 208 | parser.add_argument('-r', '--srcroot', type='path', |
| 209 | default=os.path.join(constants.SOURCE_ROOT, 'src'), |
| 210 | help='Path to root src directory.') |
| 211 | parser.add_argument('--verbose', action='store_true', |
| 212 | help='Prints out debug info.') |
| 213 | parser.add_argument('command', choices=COMMAND_DICTIONARY.keys(), |
| 214 | help='Command to run.') |
| 215 | return parser |
| 216 | |
| 217 | |
| 218 | def main(argv): |
| 219 | parser = GetParser() |
| 220 | options = parser.parse_args(argv) |
Bertrand SIMONNET | 6af5430 | 2015-08-05 10:12:49 -0700 | [diff] [blame] | 221 | options.Freeze() |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 222 | |
Bertrand SIMONNET | 6af5430 | 2015-08-05 10:12:49 -0700 | [diff] [blame] | 223 | if options.command == 'commit': |
| 224 | if not options.packages and not options.all: |
| 225 | parser.error('Please specify at least one package (--packages)') |
| 226 | if options.force and options.all: |
| 227 | parser.error('Cannot use --force with --all. You must specify a list of ' |
| 228 | 'packages you want to force uprev.') |
| 229 | |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 230 | if not os.path.isdir(options.srcroot): |
| 231 | parser.error('srcroot is not a valid path: %s' % options.srcroot) |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 232 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 233 | portage_util.EBuild.VERBOSE = options.verbose |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 234 | |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 235 | package_list = None |
| 236 | if options.packages: |
| 237 | package_list = options.packages.split(':') |
| 238 | |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 239 | if options.overlays: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 240 | overlays = {} |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 241 | for path in options.overlays.split(':'): |
Ryan Cui | 05a31ba | 2011-05-31 17:47:37 -0700 | [diff] [blame] | 242 | if not os.path.isdir(path): |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 243 | cros_build_lib.Die('Cannot find overlay: %s' % path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 244 | overlays[path] = [] |
| 245 | else: |
Ralph Nathan | 446aee9 | 2015-03-23 14:44:56 -0700 | [diff] [blame] | 246 | logging.warning('Missing --overlays argument') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 247 | overlays = { |
Mike Frysinger | e65f375 | 2014-12-08 00:46:39 -0500 | [diff] [blame] | 248 | '%s/private-overlays/chromeos-overlay' % options.srcroot: [], |
| 249 | '%s/third_party/chromiumos-overlay' % options.srcroot: [], |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 250 | } |
| 251 | |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 252 | manifest = git.ManifestCheckout.Cached(options.srcroot) |
Ryan Cui | 4656a3c | 2011-05-24 12:30:30 -0700 | [diff] [blame] | 253 | |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 254 | if options.command == 'commit': |
Bertrand SIMONNET | 6af5430 | 2015-08-05 10:12:49 -0700 | [diff] [blame] | 255 | portage_util.BuildEBuildDictionary(overlays, options.all, package_list, |
| 256 | allow_blacklisted=options.force) |
David James | 84e953c | 2013-04-23 18:44:06 -0700 | [diff] [blame] | 257 | |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 258 | # Contains the array of packages we actually revved. |
| 259 | revved_packages = [] |
| 260 | new_package_atoms = [] |
David James | a8457b5 | 2011-05-28 00:03:20 -0700 | [diff] [blame] | 261 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 262 | for overlay in overlays: |
| 263 | ebuilds = overlays[overlay] |
| 264 | if not os.path.isdir(overlay): |
| 265 | logging.warning('Skipping %s' % overlay) |
| 266 | continue |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 267 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 268 | # Note we intentionally work from the non push tracking branch; |
| 269 | # everything built thus far has been against it (meaning, http mirrors), |
| 270 | # thus we should honor that. During the actual push, the code switches |
| 271 | # to the correct urls, and does an appropriate rebasing. |
| 272 | tracking_branch = git.GetTrackingBranchViaManifest( |
| 273 | overlay, manifest=manifest).ref |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 274 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 275 | if options.command == 'push': |
| 276 | PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch, |
| 277 | options.dryrun, cwd=overlay) |
| 278 | elif options.command == 'commit': |
| 279 | existing_commit = git.GetGitRepoRevision(overlay) |
| 280 | work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch, |
| 281 | cwd=overlay) |
| 282 | work_branch.CreateBranch() |
| 283 | if not work_branch.Exists(): |
| 284 | cros_build_lib.Die('Unable to create stabilizing branch in %s' % |
| 285 | overlay) |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 286 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 287 | # In the case of uprevving overlays that have patches applied to them, |
| 288 | # include the patched changes in the stabilizing branch. |
| 289 | git.RunGit(overlay, ['rebase', existing_commit]) |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 290 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 291 | messages = [] |
| 292 | for ebuild in ebuilds: |
| 293 | if options.verbose: |
| 294 | logging.info('Working on %s', ebuild.package) |
| 295 | try: |
| 296 | new_package = ebuild.RevWorkOnEBuild(options.srcroot, manifest) |
| 297 | if new_package: |
| 298 | revved_packages.append(ebuild.package) |
| 299 | new_package_atoms.append('=%s' % new_package) |
| 300 | messages.append(_GIT_COMMIT_MESSAGE % ebuild.package) |
| 301 | except (OSError, IOError): |
| 302 | logging.warning( |
| 303 | 'Cannot rev %s\n' |
| 304 | 'Note you will have to go into %s ' |
| 305 | 'and reset the git repo yourself.' % (ebuild.package, overlay)) |
| 306 | raise |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 307 | |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 308 | if messages: |
| 309 | portage_util.EBuild.CommitChange('\n\n'.join(messages), overlay) |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 310 | |
Mike Frysinger | e8dcbfd | 2015-03-08 21:45:52 -0400 | [diff] [blame] | 311 | if options.command == 'commit': |
David James | 41124af | 2015-06-04 21:13:25 -0700 | [diff] [blame] | 312 | chroot_path = os.path.join(options.srcroot, constants.DEFAULT_CHROOT_DIR) |
| 313 | if os.path.exists(chroot_path): |
| 314 | CleanStalePackages(options.srcroot, options.boards.split(':'), |
| 315 | new_package_atoms) |
David James | 15ed130 | 2013-04-25 09:21:19 -0700 | [diff] [blame] | 316 | if options.drop_file: |
| 317 | osutils.WriteFile(options.drop_file, ' '.join(revved_packages)) |