Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 1 | #!/usr/bin/python |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 3 | # 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 Chrome for cbuildbot. |
| 7 | |
| 8 | After calling, it prints outs CHROME_VERSION_ATOM=(version atom string). A |
| 9 | caller could then use this atom with emerge to build the newly uprevved version |
| 10 | of Chrome e.g. |
| 11 | |
| 12 | ./cros_mark_chrome_as_stable tot |
| 13 | Returns chrome-base/chromeos-chrome-8.0.552.0_alpha_r1 |
| 14 | |
| 15 | emerge-x86-generic =chrome-base/chromeos-chrome-8.0.552.0_alpha_r1 |
| 16 | """ |
| 17 | |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 18 | import filecmp |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 19 | import optparse |
| 20 | import os |
| 21 | import re |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 22 | import sys |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 23 | import time |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 24 | |
Mike Frysinger | 6cb624a | 2012-05-24 18:17:38 -0400 | [diff] [blame] | 25 | from chromite.buildbot import constants |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 26 | from chromite.buildbot import portage_utilities |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 27 | from chromite.lib import cros_build_lib |
David James | ef74b1c | 2012-11-12 07:47:47 -0800 | [diff] [blame] | 28 | from chromite.lib import gclient |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 29 | from chromite.lib import git |
Mike Frysinger | 6cb624a | 2012-05-24 18:17:38 -0400 | [diff] [blame] | 30 | from chromite.scripts import cros_mark_as_stable |
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 | # Helper regex's for finding ebuilds. |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 33 | _CHROME_VERSION_REGEX = r'\d+\.\d+\.\d+\.\d+' |
| 34 | _NON_STICKY_REGEX = r'%s[(_rc.*)|(_alpha.*)]+' % _CHROME_VERSION_REGEX |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 35 | |
| 36 | # Dir where all the action happens. |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 37 | _CHROME_OVERLAY_DIR = ('%(srcroot)s/third_party/chromiumos-overlay/' + |
| 38 | constants.CHROME_CP) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 39 | |
| 40 | _GIT_COMMIT_MESSAGE = ('Marking %(chrome_rev)s for chrome ebuild with version ' |
| 41 | '%(chrome_version)s as stable.') |
| 42 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 43 | # URLs that print lists of chrome revisions between two versions of the browser. |
| 44 | _CHROME_VERSION_URL = ('http://omahaproxy.appspot.com/changelog?' |
| 45 | 'old_version=%(old)s&new_version=%(new)s') |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 46 | |
| 47 | # Only print links when we rev these types. |
| 48 | _REV_TYPES_FOR_LINKS = [constants.CHROME_REV_LATEST, |
| 49 | constants.CHROME_REV_STICKY] |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 50 | |
| 51 | _CHROME_SVN_TAG = 'CROS_SVN_COMMIT' |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 52 | |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 53 | |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 54 | def _GetSvnUrl(base_url): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 55 | """Returns the path to the svn url for the given chrome branch.""" |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 56 | return os.path.join(base_url, 'trunk') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 57 | |
| 58 | |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 59 | def _GetVersionContents(chrome_version_info): |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 60 | """Returns the current Chromium version, from the contents of a VERSION file. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 61 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 62 | Args: |
| 63 | chrome_version_info: The contents of a chromium VERSION file. |
| 64 | """ |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 65 | chrome_version_array = [] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 66 | for line in chrome_version_info.splitlines(): |
| 67 | chrome_version_array.append(line.rpartition('=')[2]) |
| 68 | |
| 69 | return '.'.join(chrome_version_array) |
| 70 | |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 71 | def _GetSpecificVersionUrl(base_url, revision, time_to_wait=600): |
| 72 | """Returns the Chromium version, from a repository URL and version. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 73 | |
| 74 | Args: |
| 75 | base_url: URL for the root of the chromium checkout. |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 76 | revision: the SVN revision we want to use. |
| 77 | time_to_wait: the minimum period before abandoning our wait for the |
| 78 | desired revision to be present. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 79 | """ |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 80 | svn_url = os.path.join(_GetSvnUrl(base_url), 'src', 'chrome', 'VERSION') |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 81 | if not revision or not (int(revision) > 0): |
| 82 | raise Exception('Revision must be positive, got %s' % revision) |
| 83 | |
| 84 | start = time.time() |
| 85 | # Use the fact we are SVN, hence ordered. |
| 86 | # Dodge the fact it will silently ignore the revision if it is not |
| 87 | # yet known. (i.e. too high) |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 88 | repo_version = gclient.GetTipOfTrunkSvnRevision(base_url) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 89 | while revision > repo_version: |
| 90 | if time.time() - start > time_to_wait: |
| 91 | raise Exception('Timeout Exceeeded') |
| 92 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 93 | msg = 'Repository only has version %s, looking for %s. Sleeping...' |
| 94 | cros_build_lib.Info(msg, repo_version, revision) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 95 | time.sleep(30) |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 96 | repo_version = gclient.GetTipOfTrunkSvnRevision(base_url) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 97 | |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 98 | chrome_version_info = cros_build_lib.RunCommand( |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 99 | ['svn', 'cat', '-r', revision, svn_url], |
| 100 | redirect_stdout=True, |
| 101 | error_message='Could not read version file at %s revision %s.' % |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 102 | (svn_url, revision)).output |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 103 | |
| 104 | return _GetVersionContents(chrome_version_info) |
| 105 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 106 | |
| 107 | def _GetTipOfTrunkVersionFile(root): |
| 108 | """Returns the current Chromium version, from a file in a checkout. |
| 109 | |
| 110 | Args: |
| 111 | root: path to the root of the chromium checkout. |
| 112 | """ |
| 113 | version_file = os.path.join(root, 'src', 'chrome', 'VERSION') |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 114 | chrome_version_info = cros_build_lib.RunCommand( |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 115 | ['cat', version_file], |
| 116 | redirect_stdout=True, |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 117 | error_message='Could not read version file at %s.' % version_file).output |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 118 | |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 119 | return _GetVersionContents(chrome_version_info) |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 120 | |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 121 | |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 122 | def _GetLatestRelease(base_url, branch=None): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 123 | """Gets the latest release version from the buildspec_url for the branch. |
| 124 | |
| 125 | Args: |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 126 | branch: If set, gets the latest release for branch, otherwise latest |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 127 | release. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 128 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 129 | Returns: |
| 130 | Latest version string. |
| 131 | """ |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 132 | buildspec_url = os.path.join(base_url, 'releases') |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 133 | svn_ls = cros_build_lib.RunCommand(['svn', 'ls', buildspec_url], |
| 134 | redirect_stdout=True).output |
| 135 | sorted_ls = cros_build_lib.RunCommand(['sort', '--version-sort', '-r'], |
| 136 | input=svn_ls, |
| 137 | redirect_stdout=True).output |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 138 | if branch: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 139 | chrome_version_re = re.compile(r'^%s\.\d+.*' % branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 140 | else: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 141 | chrome_version_re = re.compile(r'^[0-9]+\..*') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 142 | |
Peter Mayo | ad8173d | 2011-11-08 16:18:23 -0500 | [diff] [blame] | 143 | for chrome_version in sorted_ls.splitlines(): |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 144 | if chrome_version_re.match(chrome_version): |
| 145 | deps_url = os.path.join(buildspec_url, chrome_version, 'DEPS') |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 146 | deps_check = cros_build_lib.RunCommand(['svn', 'ls', deps_url], |
| 147 | error_code_ok=True, |
| 148 | redirect_stdout=True).output |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 149 | if deps_check == 'DEPS\n': |
| 150 | return chrome_version.rstrip('/') |
Peter Mayo | ad8173d | 2011-11-08 16:18:23 -0500 | [diff] [blame] | 151 | |
| 152 | return None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 153 | |
| 154 | |
| 155 | def _GetStickyEBuild(stable_ebuilds): |
| 156 | """Returns the sticky ebuild.""" |
| 157 | sticky_ebuilds = [] |
| 158 | non_sticky_re = re.compile(_NON_STICKY_REGEX) |
| 159 | for ebuild in stable_ebuilds: |
| 160 | if not non_sticky_re.match(ebuild.version): |
| 161 | sticky_ebuilds.append(ebuild) |
| 162 | |
| 163 | if not sticky_ebuilds: |
| 164 | raise Exception('No sticky ebuilds found') |
| 165 | elif len(sticky_ebuilds) > 1: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 166 | cros_build_lib.Warning('More than one sticky ebuild found') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 167 | |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 168 | return portage_utilities.BestEBuild(sticky_ebuilds) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 169 | |
| 170 | |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 171 | class ChromeEBuild(portage_utilities.EBuild): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 172 | """Thin sub-class of EBuild that adds a chrome_version field.""" |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 173 | chrome_version_re = re.compile(r'.*%s-(%s|9999).*' % ( |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 174 | constants.CHROME_PN, _CHROME_VERSION_REGEX)) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 175 | chrome_version = '' |
| 176 | |
| 177 | def __init__(self, path): |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 178 | portage_utilities.EBuild.__init__(self, path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 179 | re_match = self.chrome_version_re.match(self.ebuild_path_no_revision) |
| 180 | if re_match: |
| 181 | self.chrome_version = re_match.group(1) |
| 182 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 183 | def __str__(self): |
| 184 | return self.ebuild_path |
| 185 | |
| 186 | |
| 187 | def FindChromeCandidates(overlay_dir): |
| 188 | """Return a tuple of chrome's unstable ebuild and stable ebuilds. |
| 189 | |
| 190 | Args: |
| 191 | overlay_dir: The path to chrome's portage overlay dir. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 192 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 193 | Returns: |
| 194 | Tuple [unstable_ebuild, stable_ebuilds]. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 195 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 196 | Raises: |
| 197 | Exception: if no unstable ebuild exists for Chrome. |
| 198 | """ |
| 199 | stable_ebuilds = [] |
| 200 | unstable_ebuilds = [] |
| 201 | for path in [ |
| 202 | os.path.join(overlay_dir, entry) for entry in os.listdir(overlay_dir)]: |
| 203 | if path.endswith('.ebuild'): |
| 204 | ebuild = ChromeEBuild(path) |
| 205 | if not ebuild.chrome_version: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 206 | cros_build_lib.Warning('Poorly formatted ebuild found at %s' % path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 207 | else: |
| 208 | if '9999' in ebuild.version: |
| 209 | unstable_ebuilds.append(ebuild) |
| 210 | else: |
| 211 | stable_ebuilds.append(ebuild) |
| 212 | |
| 213 | # Apply some sanity checks. |
| 214 | if not unstable_ebuilds: |
| 215 | raise Exception('Missing 9999 ebuild for %s' % overlay_dir) |
| 216 | if not stable_ebuilds: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 217 | cros_build_lib.Warning('Missing stable ebuild for %s' % overlay_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 218 | |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 219 | return portage_utilities.BestEBuild(unstable_ebuilds), stable_ebuilds |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 220 | |
| 221 | |
| 222 | def FindChromeUprevCandidate(stable_ebuilds, chrome_rev, sticky_branch): |
| 223 | """Finds the Chrome uprev candidate for the given chrome_rev. |
| 224 | |
| 225 | Using the pre-flight logic, this means the stable ebuild you are uprevving |
| 226 | from. The difference here is that the version could be different and in |
| 227 | that case we want to find it to delete it. |
| 228 | |
| 229 | Args: |
| 230 | stable_ebuilds: A list of stable ebuilds. |
| 231 | chrome_rev: The chrome_rev designating which candidate to find. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 232 | sticky_branch: The the branch that is currently sticky with Major/Minor |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 233 | components. For example: 9.0.553. Can be None but not if chrome_rev |
| 234 | is CHROME_REV_STICKY. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 235 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 236 | Returns: |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 237 | The EBuild, otherwise None if none found. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 238 | """ |
| 239 | candidates = [] |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 240 | if chrome_rev in [constants.CHROME_REV_LOCAL, constants.CHROME_REV_TOT, |
| 241 | constants.CHROME_REV_SPEC]: |
| 242 | # These are labelled alpha, for historic reasons, |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 243 | # not just for the fun of confusion. |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 244 | chrome_branch_re = re.compile(r'%s.*_alpha.*' % _CHROME_VERSION_REGEX) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 245 | for ebuild in stable_ebuilds: |
| 246 | if chrome_branch_re.search(ebuild.version): |
| 247 | candidates.append(ebuild) |
| 248 | |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 249 | elif chrome_rev == constants.CHROME_REV_STICKY: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 250 | assert sticky_branch is not None |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 251 | chrome_branch_re = re.compile(r'%s\..*' % sticky_branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 252 | for ebuild in stable_ebuilds: |
| 253 | if chrome_branch_re.search(ebuild.version): |
| 254 | candidates.append(ebuild) |
| 255 | |
| 256 | else: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 257 | chrome_branch_re = re.compile(r'%s.*_rc.*' % _CHROME_VERSION_REGEX) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 258 | for ebuild in stable_ebuilds: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 259 | if chrome_branch_re.search(ebuild.version): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 260 | candidates.append(ebuild) |
| 261 | |
| 262 | if candidates: |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 263 | return portage_utilities.BestEBuild(candidates) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 264 | else: |
| 265 | return None |
| 266 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 267 | def _AnnotateAndPrint(text, url): |
| 268 | """Add buildbot trappings to print <a href='url'>text</a> in the waterfall. |
| 269 | |
| 270 | Args: |
| 271 | text: Anchor text for the link |
| 272 | url: the URL to which to link |
| 273 | """ |
Don Garrett | e60de90 | 2011-10-17 18:52:05 -0700 | [diff] [blame] | 274 | print >> sys.stderr, '\n@@@STEP_LINK@%(text)s@%(url)s@@@' % { 'text': text, |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 275 | 'url': url } |
| 276 | |
| 277 | def GetChromeRevisionLinkFromVersions(old_chrome_version, chrome_version): |
| 278 | """Return appropriately formatted link to revision info, given versions |
| 279 | |
| 280 | Given two chrome version strings (e.g. 9.0.533.0), generate a link to a |
| 281 | page that prints the Chromium revisions between those two versions. |
| 282 | |
| 283 | Args: |
| 284 | old_chrome_version: version to diff from |
| 285 | chrome_version: version to which to diff |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 286 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 287 | Returns: |
| 288 | The desired URL. |
| 289 | """ |
| 290 | return _CHROME_VERSION_URL % { 'old': old_chrome_version, |
| 291 | 'new': chrome_version } |
| 292 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 293 | def GetChromeRevisionListLink(old_chrome, new_chrome, chrome_rev): |
| 294 | """Returns a link to the list of revisions between two Chromium versions |
| 295 | |
| 296 | Given two ChromeEBuilds and the kind of rev we're doing, generate a |
| 297 | link to a page that prints the Chromium changes between those two |
| 298 | revisions, inclusive. |
| 299 | |
| 300 | Args: |
| 301 | old_chrome: ebuild for the version to diff from |
| 302 | new_chrome: ebuild for the version to which to diff |
| 303 | chrome_rev: one of constants.VALID_CHROME_REVISIONS |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 304 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 305 | Returns: |
| 306 | The desired URL. |
| 307 | """ |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 308 | assert chrome_rev in _REV_TYPES_FOR_LINKS |
| 309 | return GetChromeRevisionLinkFromVersions(old_chrome.chrome_version, |
| 310 | new_chrome.chrome_version) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 311 | |
| 312 | def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_rev, |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 313 | chrome_version, commit, overlay_dir): |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 314 | r"""Uprevs the chrome ebuild specified by chrome_rev. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 315 | |
| 316 | This is the main function that uprevs the chrome_rev from a stable candidate |
| 317 | to its new version. |
| 318 | |
| 319 | Args: |
| 320 | stable_candidate: ebuild that corresponds to the stable ebuild we are |
| 321 | revving from. If None, builds the a new ebuild given the version |
| 322 | and logic for chrome_rev type with revision set to 1. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 323 | unstable_ebuild: ebuild corresponding to the unstable ebuild for chrome. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 324 | chrome_rev: one of constants.VALID_CHROME_REVISIONS or LOCAL |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 325 | constants.CHROME_REV_SPEC - Requires commit value. Revs the ebuild for |
| 326 | the specified version and uses the portage suffix of _alpha. |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 327 | constants.CHROME_REV_TOT - Requires commit value. Revs the ebuild for |
| 328 | the TOT version and uses the portage suffix of _alpha. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 329 | constants.CHROME_REV_LOCAL - Requires a chrome_root. Revs the ebuild for |
| 330 | the local version and uses the portage suffix of _alpha. |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 331 | constants.CHROME_REV_LATEST - This uses the portage suffix of _rc as they |
| 332 | are release candidates for the next sticky version. |
| 333 | constants.CHROME_REV_STICKY - Revs the sticky version. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 334 | chrome_version: The \d.\d.\d.\d version of Chrome. |
| 335 | commit: Used with constants.CHROME_REV_TOT. The svn revision of chrome. |
| 336 | overlay_dir: Path to the chromeos-chrome package dir. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 337 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 338 | Returns: |
| 339 | Full portage version atom (including rc's, etc) that was revved. |
| 340 | """ |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 341 | def IsTheNewEBuildRedundant(new_ebuild, stable_ebuild): |
| 342 | """Returns True if the new ebuild is redundant. |
| 343 | |
| 344 | This is True if there if the current stable ebuild is the exact same copy |
David James | 89608f9 | 2012-11-03 14:14:12 -0700 | [diff] [blame] | 345 | of the new one. |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 346 | """ |
| 347 | if not stable_ebuild: |
| 348 | return False |
| 349 | |
| 350 | if stable_candidate.chrome_version == new_ebuild.chrome_version: |
David James | 89608f9 | 2012-11-03 14:14:12 -0700 | [diff] [blame] | 351 | return filecmp.cmp( |
| 352 | new_ebuild.ebuild_path, stable_ebuild.ebuild_path, shallow=False) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 353 | |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 354 | # Mark latest release and sticky branches as stable. |
| 355 | mark_stable = chrome_rev not in [constants.CHROME_REV_TOT, |
| 356 | constants.CHROME_REV_SPEC, |
| 357 | constants.CHROME_REV_LOCAL] |
| 358 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 359 | # Case where we have the last stable candidate with same version just rev. |
| 360 | if stable_candidate and stable_candidate.chrome_version == chrome_version: |
| 361 | new_ebuild_path = '%s-r%d.ebuild' % ( |
| 362 | stable_candidate.ebuild_path_no_revision, |
| 363 | stable_candidate.current_revision + 1) |
| 364 | else: |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 365 | suffix = 'rc' if mark_stable else 'alpha' |
| 366 | pf = '%s-%s_%s-r1' % (constants.CHROME_PN, chrome_version, suffix) |
| 367 | new_ebuild_path = os.path.join(overlay_dir, '%s.ebuild' % pf) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 368 | |
David James | a679255 | 2012-04-03 10:05:35 -0700 | [diff] [blame] | 369 | chrome_variables = dict() |
| 370 | if commit: |
| 371 | chrome_variables[_CHROME_SVN_TAG] = commit |
| 372 | |
J. Richard Barnette | 0cfc505 | 2011-11-28 14:31:39 -0800 | [diff] [blame] | 373 | portage_utilities.EBuild.MarkAsStable( |
David James | 065b201 | 2012-04-01 14:51:11 -0700 | [diff] [blame] | 374 | unstable_ebuild.ebuild_path, new_ebuild_path, |
David James | a679255 | 2012-04-03 10:05:35 -0700 | [diff] [blame] | 375 | chrome_variables, make_stable=mark_stable) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 376 | new_ebuild = ChromeEBuild(new_ebuild_path) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 377 | |
| 378 | # Determine whether this is ebuild is redundant. |
| 379 | if IsTheNewEBuildRedundant(new_ebuild, stable_candidate): |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 380 | msg = 'Previous ebuild with same version found and ebuild is redundant.' |
| 381 | cros_build_lib.Info(msg) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 382 | os.unlink(new_ebuild_path) |
| 383 | return None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 384 | |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 385 | if stable_candidate and chrome_rev in _REV_TYPES_FOR_LINKS: |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 386 | _AnnotateAndPrint('Chromium revisions', |
| 387 | GetChromeRevisionListLink(stable_candidate, |
| 388 | new_ebuild, |
| 389 | chrome_rev)) |
| 390 | |
David James | 67d7325 | 2013-09-19 17:33:12 -0700 | [diff] [blame] | 391 | git.RunGit(overlay_dir, ['add', new_ebuild_path]) |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 392 | if stable_candidate and not stable_candidate.IsSticky(): |
David James | 67d7325 | 2013-09-19 17:33:12 -0700 | [diff] [blame] | 393 | git.RunGit(overlay_dir, ['rm', stable_candidate.ebuild_path]) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 394 | |
J. Richard Barnette | 0cfc505 | 2011-11-28 14:31:39 -0800 | [diff] [blame] | 395 | portage_utilities.EBuild.CommitChange( |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 396 | _GIT_COMMIT_MESSAGE % {'chrome_rev': chrome_rev, |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 397 | 'chrome_version': chrome_version}, |
| 398 | overlay_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 399 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 400 | return '%s-%s' % (new_ebuild.package, new_ebuild.version) |
| 401 | |
| 402 | |
Chris Sosa | d53f8fd | 2011-10-21 15:15:19 -0700 | [diff] [blame] | 403 | def ParseMaxRevision(revision_list): |
| 404 | """Returns the max revision from a list of url@revision string.""" |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 405 | revision_re = re.compile(r'.*@(\d+)') |
Chris Sosa | d53f8fd | 2011-10-21 15:15:19 -0700 | [diff] [blame] | 406 | |
| 407 | def RevisionKey(revision): |
| 408 | return revision_re.match(revision).group(1) |
| 409 | |
| 410 | max_revision = max(revision_list.split(), key=RevisionKey) |
| 411 | return max_revision.rpartition('@')[2] |
| 412 | |
| 413 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 414 | def main(_argv): |
Chris Sosa | 0f295aa | 2011-10-21 14:10:28 -0700 | [diff] [blame] | 415 | usage_options = '|'.join(constants.VALID_CHROME_REVISIONS) |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 416 | usage = '%s OPTIONS [%s]' % (__file__, usage_options) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 417 | parser = optparse.OptionParser(usage) |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 418 | parser.add_option('-b', '--boards', default='x86-generic') |
David James | ef74b1c | 2012-11-12 07:47:47 -0800 | [diff] [blame] | 419 | parser.add_option('-c', '--chrome_url', default=gclient.GetBaseURLs()[0]) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 420 | parser.add_option('-f', '--force_revision', default=None) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 421 | parser.add_option('-s', '--srcroot', default=os.path.join(os.environ['HOME'], |
| 422 | 'trunk', 'src'), |
| 423 | help='Path to the src directory') |
| 424 | parser.add_option('-t', '--tracking_branch', default='cros/master', |
| 425 | help='Branch we are tracking changes against') |
| 426 | (options, args) = parser.parse_args() |
| 427 | |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 428 | if len(args) != 1 or args[0] not in constants.VALID_CHROME_REVISIONS: |
| 429 | parser.error('Commit requires arg set to one of %s.' |
| 430 | % constants.VALID_CHROME_REVISIONS) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 431 | |
| 432 | overlay_dir = os.path.abspath(_CHROME_OVERLAY_DIR % |
| 433 | {'srcroot': options.srcroot}) |
| 434 | chrome_rev = args[0] |
| 435 | version_to_uprev = None |
| 436 | commit_to_use = None |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 437 | sticky_branch = None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 438 | |
| 439 | (unstable_ebuild, stable_ebuilds) = FindChromeCandidates(overlay_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 440 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 441 | if chrome_rev == constants.CHROME_REV_LOCAL: |
| 442 | if 'CHROME_ROOT' in os.environ: |
| 443 | chrome_root = os.environ['CHROME_ROOT'] |
| 444 | else: |
| 445 | chrome_root = os.path.join(os.environ['HOME'], 'chrome_root') |
| 446 | |
| 447 | version_to_uprev = _GetTipOfTrunkVersionFile(chrome_root) |
| 448 | commit_to_use = 'Unknown' |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 449 | cros_build_lib.Info('Using local source, versioning is untrustworthy.') |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 450 | elif chrome_rev == constants.CHROME_REV_SPEC: |
| 451 | commit_to_use = options.force_revision |
Mike Frysinger | f02736e | 2013-11-08 15:27:00 -0500 | [diff] [blame] | 452 | if '@' in commit_to_use: |
| 453 | commit_to_use = ParseMaxRevision(commit_to_use) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 454 | version_to_uprev = _GetSpecificVersionUrl(options.chrome_url, |
| 455 | commit_to_use) |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 456 | elif chrome_rev == constants.CHROME_REV_TOT: |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 457 | commit_to_use = gclient.GetTipOfTrunkSvnRevision(options.chrome_url) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 458 | version_to_uprev = _GetSpecificVersionUrl(options.chrome_url, |
| 459 | commit_to_use) |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 460 | elif chrome_rev == constants.CHROME_REV_LATEST: |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 461 | version_to_uprev = _GetLatestRelease(options.chrome_url) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 462 | else: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 463 | sticky_ebuild = _GetStickyEBuild(stable_ebuilds) |
| 464 | sticky_version = sticky_ebuild.chrome_version |
| 465 | sticky_branch = sticky_version.rpartition('.')[0] |
Peter Mayo | f65b841 | 2011-08-26 01:22:21 -0400 | [diff] [blame] | 466 | version_to_uprev = _GetLatestRelease(options.chrome_url, sticky_branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 467 | |
| 468 | stable_candidate = FindChromeUprevCandidate(stable_ebuilds, chrome_rev, |
| 469 | sticky_branch) |
| 470 | |
| 471 | if stable_candidate: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 472 | cros_build_lib.Info('Stable candidate found %s' % stable_candidate) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 473 | else: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 474 | cros_build_lib.Info('No stable candidate found.') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 475 | |
Chris Sosa | 8049f3b | 2011-05-02 20:09:28 -0700 | [diff] [blame] | 476 | tracking_branch = 'remotes/m/%s' % os.path.basename(options.tracking_branch) |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 477 | existing_branch = git.GetCurrentBranch(overlay_dir) |
Ryan Cui | 05a31ba | 2011-05-31 17:47:37 -0700 | [diff] [blame] | 478 | work_branch = cros_mark_as_stable.GitBranch(constants.STABLE_EBUILD_BRANCH, |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 479 | tracking_branch, overlay_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 480 | work_branch.CreateBranch() |
David James | d6708c0 | 2012-03-22 10:49:15 -0700 | [diff] [blame] | 481 | |
| 482 | # In the case of uprevving overlays that have patches applied to them, |
| 483 | # include the patched changes in the stabilizing branch. |
| 484 | if existing_branch: |
David James | 67d7325 | 2013-09-19 17:33:12 -0700 | [diff] [blame] | 485 | git.RunGit(overlay_dir, ['rebase', existing_branch]) |
David James | d6708c0 | 2012-03-22 10:49:15 -0700 | [diff] [blame] | 486 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 487 | chrome_version_atom = MarkChromeEBuildAsStable( |
| 488 | stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev, |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 489 | commit_to_use, overlay_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 490 | # Explicit print to communicate to caller. |
| 491 | if chrome_version_atom: |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 492 | cros_mark_as_stable.CleanStalePackages(options.boards.split(':'), |
| 493 | [chrome_version_atom]) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 494 | print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom |