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 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 18 | import base64 |
| 19 | import distutils.version |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 20 | import filecmp |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 21 | import optparse |
| 22 | import os |
| 23 | import re |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 24 | import sys |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 25 | import urlparse |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 26 | |
Don Garrett | 88b8d78 | 2014-05-13 17:30:55 -0700 | [diff] [blame] | 27 | from chromite.cbuildbot import constants |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 28 | from chromite.lib import cros_build_lib |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 29 | from chromite.lib import git |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 30 | from chromite.lib import gob_util |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 31 | from chromite.lib import portage_util |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 32 | from chromite.lib import timeout_util |
Mike Frysinger | 6cb624a | 2012-05-24 18:17:38 -0400 | [diff] [blame] | 33 | from chromite.scripts import cros_mark_as_stable |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 34 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 35 | # Helper regex's for finding ebuilds. |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 36 | _CHROME_VERSION_REGEX = r'\d+\.\d+\.\d+\.\d+' |
| 37 | _NON_STICKY_REGEX = r'%s[(_rc.*)|(_alpha.*)]+' % _CHROME_VERSION_REGEX |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 38 | |
| 39 | # Dir where all the action happens. |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 40 | _OVERLAY_DIR = '%(srcroot)s/third_party/chromiumos-overlay/' |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 41 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 42 | _GIT_COMMIT_MESSAGE = ('Marking %(chrome_rev)s for %(chrome_pn)s ebuild ' |
| 43 | 'with version %(chrome_version)s as stable.') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 44 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 45 | # URLs that print lists of chrome revisions between two versions of the browser. |
| 46 | _CHROME_VERSION_URL = ('http://omahaproxy.appspot.com/changelog?' |
| 47 | 'old_version=%(old)s&new_version=%(new)s') |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 48 | |
| 49 | # Only print links when we rev these types. |
| 50 | _REV_TYPES_FOR_LINKS = [constants.CHROME_REV_LATEST, |
| 51 | constants.CHROME_REV_STICKY] |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 52 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 53 | # TODO(szager): This is inaccurate, but is it safe to change? I have no idea. |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 54 | _CHROME_SVN_TAG = 'CROS_SVN_COMMIT' |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 55 | |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 56 | |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 57 | def _GetVersionContents(chrome_version_info): |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 58 | """Returns the current Chromium version, from the contents of a VERSION file. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 59 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 60 | Args: |
| 61 | chrome_version_info: The contents of a chromium VERSION file. |
| 62 | """ |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 63 | chrome_version_array = [] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 64 | for line in chrome_version_info.splitlines(): |
| 65 | chrome_version_array.append(line.rpartition('=')[2]) |
| 66 | |
| 67 | return '.'.join(chrome_version_array) |
| 68 | |
Mike Frysinger | cc83883 | 2014-05-24 13:10:30 -0400 | [diff] [blame] | 69 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 70 | def _GetSpecificVersionUrl(git_url, revision, time_to_wait=600): |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 71 | """Returns the Chromium version, from a repository URL and version. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 72 | |
| 73 | Args: |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 74 | git_url: Repository URL for chromium. |
| 75 | revision: the git revision we want to use. |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 76 | time_to_wait: the minimum period before abandoning our wait for the |
| 77 | desired revision to be present. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 78 | """ |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 79 | parsed_url = urlparse.urlparse(git_url) |
| 80 | host = parsed_url[1] |
| 81 | path = parsed_url[2].rstrip('/') + ( |
| 82 | '/+/%s/chrome/VERSION?format=text' % revision) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 83 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 84 | # Allow for git repository replication lag with sleep/retry loop. |
| 85 | def _fetch(): |
| 86 | fh = gob_util.FetchUrl(host, path, ignore_404=True) |
| 87 | return fh.read() if fh else None |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 88 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 89 | def _wait_msg(_remaining_minutes): |
| 90 | cros_build_lib.Info( |
| 91 | 'Repository does not yet have revision %s. Sleeping...', |
| 92 | revision) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 93 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 94 | content = timeout_util.WaitForSuccess( |
| 95 | retry_check=lambda x: not bool(x), |
| 96 | func=_fetch, |
| 97 | timeout=time_to_wait, |
| 98 | period=30, |
| 99 | side_effect_func=_wait_msg) |
| 100 | return _GetVersionContents(base64.b64decode(content)) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 101 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 102 | |
| 103 | def _GetTipOfTrunkVersionFile(root): |
| 104 | """Returns the current Chromium version, from a file in a checkout. |
| 105 | |
| 106 | Args: |
| 107 | root: path to the root of the chromium checkout. |
| 108 | """ |
| 109 | version_file = os.path.join(root, 'src', 'chrome', 'VERSION') |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 110 | chrome_version_info = cros_build_lib.RunCommand( |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 111 | ['cat', version_file], |
| 112 | redirect_stdout=True, |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 113 | error_message='Could not read version file at %s.' % version_file).output |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 114 | |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 115 | return _GetVersionContents(chrome_version_info) |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 116 | |
ChromeOS Developer | 03118eb | 2013-02-12 14:27:09 -0800 | [diff] [blame] | 117 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 118 | def CheckIfChromeRightForOS(deps_content): |
Dharani Govindan | 4beb94c | 2014-07-18 13:31:47 -0700 | [diff] [blame] | 119 | """Checks if DEPS is right for Chrome OS. |
| 120 | |
| 121 | This function checks for a variable called 'buildspec_platforms' to |
| 122 | find out if its 'chromeos' or 'all'. If any of those values, |
| 123 | then it chooses that DEPS. |
| 124 | |
| 125 | Args: |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 126 | deps_content: Content of release buildspec DEPS file. |
Dharani Govindan | 4beb94c | 2014-07-18 13:31:47 -0700 | [diff] [blame] | 127 | |
| 128 | Returns: |
| 129 | True if DEPS is the right Chrome for Chrome OS. |
| 130 | """ |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 131 | platforms_search = re.search(r'buildspec_platforms.*\s.*\s', deps_content) |
Dharani Govindan | cbbf69c | 2014-07-29 15:37:39 -0700 | [diff] [blame] | 132 | |
| 133 | if platforms_search: |
| 134 | platforms = platforms_search.group() |
| 135 | if 'chromeos' in platforms or 'all' in platforms: |
| 136 | return True |
Dharani Govindan | 4beb94c | 2014-07-18 13:31:47 -0700 | [diff] [blame] | 137 | |
| 138 | return False |
| 139 | |
| 140 | |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 141 | def GetLatestRelease(git_url, branch=None): |
| 142 | """Gets the latest release version from the release tags in the repository. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 143 | |
| 144 | Args: |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 145 | git_url: URL of git repository. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 146 | branch: If set, gets the latest release for branch, otherwise latest |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 147 | release. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 148 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 149 | Returns: |
| 150 | Latest version string. |
| 151 | """ |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 152 | # TODO(szager): This only works for public release buildspecs in the chromium |
| 153 | # src repository. Internal buildspecs are tracked differently. At the time |
| 154 | # of writing, I can't find any callers that use this method to scan for |
| 155 | # internal buildspecs. But there may be something lurking... |
| 156 | |
| 157 | parsed_url = urlparse.urlparse(git_url) |
| 158 | path = parsed_url[2].rstrip('/') + '/+refs/tags?format=JSON' |
| 159 | j = gob_util.FetchUrlJson(parsed_url[1], path, ignore_404=False) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 160 | if branch: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 161 | chrome_version_re = re.compile(r'^%s\.\d+.*' % branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 162 | else: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 163 | chrome_version_re = re.compile(r'^[0-9]+\..*') |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 164 | matching_versions = [key for key in j.keys() if chrome_version_re.match(key)] |
| 165 | matching_versions.sort(key=distutils.version.LooseVersion) |
| 166 | for chrome_version in reversed(matching_versions): |
| 167 | path = parsed_url[2].rstrip() + ( |
| 168 | '/+/refs/tags/%s/DEPS?format=text' % chrome_version) |
| 169 | fh = gob_util.FetchUrl(parsed_url[1], path, ignore_404=False) |
| 170 | content = fh.read() if fh else None |
| 171 | if content: |
| 172 | deps_content = base64.b64decode(content) |
| 173 | if CheckIfChromeRightForOS(deps_content): |
| 174 | return chrome_version |
Peter Mayo | ad8173d | 2011-11-08 16:18:23 -0500 | [diff] [blame] | 175 | |
| 176 | return None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 177 | |
| 178 | |
| 179 | def _GetStickyEBuild(stable_ebuilds): |
| 180 | """Returns the sticky ebuild.""" |
| 181 | sticky_ebuilds = [] |
| 182 | non_sticky_re = re.compile(_NON_STICKY_REGEX) |
| 183 | for ebuild in stable_ebuilds: |
| 184 | if not non_sticky_re.match(ebuild.version): |
| 185 | sticky_ebuilds.append(ebuild) |
| 186 | |
| 187 | if not sticky_ebuilds: |
| 188 | raise Exception('No sticky ebuilds found') |
| 189 | elif len(sticky_ebuilds) > 1: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 190 | cros_build_lib.Warning('More than one sticky ebuild found') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 191 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 192 | return portage_util.BestEBuild(sticky_ebuilds) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 193 | |
| 194 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 195 | class ChromeEBuild(portage_util.EBuild): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 196 | """Thin sub-class of EBuild that adds a chrome_version field.""" |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 197 | chrome_version_re = re.compile(r'.*-(%s|9999).*' % ( |
| 198 | _CHROME_VERSION_REGEX)) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 199 | chrome_version = '' |
| 200 | |
| 201 | def __init__(self, path): |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 202 | portage_util.EBuild.__init__(self, path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 203 | re_match = self.chrome_version_re.match(self.ebuild_path_no_revision) |
| 204 | if re_match: |
| 205 | self.chrome_version = re_match.group(1) |
| 206 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 207 | def __str__(self): |
| 208 | return self.ebuild_path |
| 209 | |
| 210 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 211 | def FindChromeCandidates(package_dir): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 212 | """Return a tuple of chrome's unstable ebuild and stable ebuilds. |
| 213 | |
| 214 | Args: |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 215 | package_dir: The path to where the package ebuild is stored. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 216 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 217 | Returns: |
| 218 | Tuple [unstable_ebuild, stable_ebuilds]. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 219 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 220 | Raises: |
| 221 | Exception: if no unstable ebuild exists for Chrome. |
| 222 | """ |
| 223 | stable_ebuilds = [] |
| 224 | unstable_ebuilds = [] |
| 225 | for path in [ |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 226 | os.path.join(package_dir, entry) for entry in os.listdir(package_dir)]: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 227 | if path.endswith('.ebuild'): |
| 228 | ebuild = ChromeEBuild(path) |
| 229 | if not ebuild.chrome_version: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 230 | cros_build_lib.Warning('Poorly formatted ebuild found at %s' % path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 231 | else: |
| 232 | if '9999' in ebuild.version: |
| 233 | unstable_ebuilds.append(ebuild) |
| 234 | else: |
| 235 | stable_ebuilds.append(ebuild) |
| 236 | |
| 237 | # Apply some sanity checks. |
| 238 | if not unstable_ebuilds: |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 239 | raise Exception('Missing 9999 ebuild for %s' % package_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 240 | if not stable_ebuilds: |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 241 | cros_build_lib.Warning('Missing stable ebuild for %s' % package_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 242 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 243 | return portage_util.BestEBuild(unstable_ebuilds), stable_ebuilds |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 244 | |
| 245 | |
| 246 | def FindChromeUprevCandidate(stable_ebuilds, chrome_rev, sticky_branch): |
| 247 | """Finds the Chrome uprev candidate for the given chrome_rev. |
| 248 | |
| 249 | Using the pre-flight logic, this means the stable ebuild you are uprevving |
| 250 | from. The difference here is that the version could be different and in |
| 251 | that case we want to find it to delete it. |
| 252 | |
| 253 | Args: |
| 254 | stable_ebuilds: A list of stable ebuilds. |
| 255 | chrome_rev: The chrome_rev designating which candidate to find. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 256 | sticky_branch: The the branch that is currently sticky with Major/Minor |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 257 | components. For example: 9.0.553. Can be None but not if chrome_rev |
| 258 | is CHROME_REV_STICKY. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 259 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 260 | Returns: |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 261 | The EBuild, otherwise None if none found. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 262 | """ |
| 263 | candidates = [] |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 264 | if chrome_rev in [constants.CHROME_REV_LOCAL, constants.CHROME_REV_TOT, |
| 265 | constants.CHROME_REV_SPEC]: |
| 266 | # These are labelled alpha, for historic reasons, |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 267 | # not just for the fun of confusion. |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 268 | chrome_branch_re = re.compile(r'%s.*_alpha.*' % _CHROME_VERSION_REGEX) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 269 | for ebuild in stable_ebuilds: |
| 270 | if chrome_branch_re.search(ebuild.version): |
| 271 | candidates.append(ebuild) |
| 272 | |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 273 | elif chrome_rev == constants.CHROME_REV_STICKY: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 274 | assert sticky_branch is not None |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 275 | chrome_branch_re = re.compile(r'%s\..*' % sticky_branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 276 | for ebuild in stable_ebuilds: |
| 277 | if chrome_branch_re.search(ebuild.version): |
| 278 | candidates.append(ebuild) |
| 279 | |
| 280 | else: |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 281 | chrome_branch_re = re.compile(r'%s.*_rc.*' % _CHROME_VERSION_REGEX) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 282 | for ebuild in stable_ebuilds: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 283 | if chrome_branch_re.search(ebuild.version): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 284 | candidates.append(ebuild) |
| 285 | |
| 286 | if candidates: |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 287 | return portage_util.BestEBuild(candidates) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 288 | else: |
| 289 | return None |
| 290 | |
Mike Frysinger | cc83883 | 2014-05-24 13:10:30 -0400 | [diff] [blame] | 291 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 292 | def _AnnotateAndPrint(text, url): |
| 293 | """Add buildbot trappings to print <a href='url'>text</a> in the waterfall. |
| 294 | |
| 295 | Args: |
| 296 | text: Anchor text for the link |
| 297 | url: the URL to which to link |
| 298 | """ |
Don Garrett | e60de90 | 2011-10-17 18:52:05 -0700 | [diff] [blame] | 299 | print >> sys.stderr, '\n@@@STEP_LINK@%(text)s@%(url)s@@@' % { 'text': text, |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 300 | 'url': url } |
| 301 | |
| 302 | def GetChromeRevisionLinkFromVersions(old_chrome_version, chrome_version): |
| 303 | """Return appropriately formatted link to revision info, given versions |
| 304 | |
| 305 | Given two chrome version strings (e.g. 9.0.533.0), generate a link to a |
| 306 | page that prints the Chromium revisions between those two versions. |
| 307 | |
| 308 | Args: |
| 309 | old_chrome_version: version to diff from |
| 310 | chrome_version: version to which to diff |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 311 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 312 | Returns: |
| 313 | The desired URL. |
| 314 | """ |
| 315 | return _CHROME_VERSION_URL % { 'old': old_chrome_version, |
| 316 | 'new': chrome_version } |
| 317 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 318 | def GetChromeRevisionListLink(old_chrome, new_chrome, chrome_rev): |
| 319 | """Returns a link to the list of revisions between two Chromium versions |
| 320 | |
| 321 | Given two ChromeEBuilds and the kind of rev we're doing, generate a |
| 322 | link to a page that prints the Chromium changes between those two |
| 323 | revisions, inclusive. |
| 324 | |
| 325 | Args: |
| 326 | old_chrome: ebuild for the version to diff from |
| 327 | new_chrome: ebuild for the version to which to diff |
| 328 | chrome_rev: one of constants.VALID_CHROME_REVISIONS |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 329 | |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 330 | Returns: |
| 331 | The desired URL. |
| 332 | """ |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 333 | assert chrome_rev in _REV_TYPES_FOR_LINKS |
| 334 | return GetChromeRevisionLinkFromVersions(old_chrome.chrome_version, |
| 335 | new_chrome.chrome_version) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 336 | |
Mike Frysinger | cc83883 | 2014-05-24 13:10:30 -0400 | [diff] [blame] | 337 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 338 | def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_pn, |
| 339 | chrome_rev, chrome_version, commit, package_dir): |
David James | 7c352bc | 2013-03-15 14:19:57 -0700 | [diff] [blame] | 340 | r"""Uprevs the chrome ebuild specified by chrome_rev. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 341 | |
| 342 | This is the main function that uprevs the chrome_rev from a stable candidate |
| 343 | to its new version. |
| 344 | |
| 345 | Args: |
| 346 | stable_candidate: ebuild that corresponds to the stable ebuild we are |
| 347 | revving from. If None, builds the a new ebuild given the version |
| 348 | and logic for chrome_rev type with revision set to 1. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 349 | unstable_ebuild: ebuild corresponding to the unstable ebuild for chrome. |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 350 | chrome_pn: package name. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 351 | chrome_rev: one of constants.VALID_CHROME_REVISIONS or LOCAL |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 352 | constants.CHROME_REV_SPEC - Requires commit value. Revs the ebuild for |
| 353 | the specified version and uses the portage suffix of _alpha. |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 354 | constants.CHROME_REV_TOT - Requires commit value. Revs the ebuild for |
| 355 | the TOT version and uses the portage suffix of _alpha. |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 356 | constants.CHROME_REV_LOCAL - Requires a chrome_root. Revs the ebuild for |
| 357 | the local version and uses the portage suffix of _alpha. |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 358 | constants.CHROME_REV_LATEST - This uses the portage suffix of _rc as they |
| 359 | are release candidates for the next sticky version. |
| 360 | constants.CHROME_REV_STICKY - Revs the sticky version. |
Mike Frysinger | ad8c6ca | 2014-02-03 11:28:45 -0500 | [diff] [blame] | 361 | chrome_version: The \d.\d.\d.\d version of Chrome. |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 362 | commit: Used with constants.CHROME_REV_TOT. The git revision of chrome. |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 363 | package_dir: Path to the chromeos-chrome package dir. |
Mike Frysinger | 1a736a8 | 2013-12-12 01:50:59 -0500 | [diff] [blame] | 364 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 365 | Returns: |
| 366 | Full portage version atom (including rc's, etc) that was revved. |
| 367 | """ |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 368 | def IsTheNewEBuildRedundant(new_ebuild, stable_ebuild): |
| 369 | """Returns True if the new ebuild is redundant. |
| 370 | |
| 371 | 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] | 372 | of the new one. |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 373 | """ |
| 374 | if not stable_ebuild: |
| 375 | return False |
| 376 | |
| 377 | if stable_candidate.chrome_version == new_ebuild.chrome_version: |
David James | 89608f9 | 2012-11-03 14:14:12 -0700 | [diff] [blame] | 378 | return filecmp.cmp( |
| 379 | new_ebuild.ebuild_path, stable_ebuild.ebuild_path, shallow=False) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 380 | |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 381 | # Mark latest release and sticky branches as stable. |
| 382 | mark_stable = chrome_rev not in [constants.CHROME_REV_TOT, |
| 383 | constants.CHROME_REV_SPEC, |
| 384 | constants.CHROME_REV_LOCAL] |
| 385 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 386 | # Case where we have the last stable candidate with same version just rev. |
| 387 | if stable_candidate and stable_candidate.chrome_version == chrome_version: |
| 388 | new_ebuild_path = '%s-r%d.ebuild' % ( |
| 389 | stable_candidate.ebuild_path_no_revision, |
| 390 | stable_candidate.current_revision + 1) |
| 391 | else: |
David James | 629febb | 2012-11-25 13:07:34 -0800 | [diff] [blame] | 392 | suffix = 'rc' if mark_stable else 'alpha' |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 393 | pf = '%s-%s_%s-r1' % (chrome_pn, chrome_version, suffix) |
| 394 | new_ebuild_path = os.path.join(package_dir, '%s.ebuild' % pf) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 395 | |
David James | a679255 | 2012-04-03 10:05:35 -0700 | [diff] [blame] | 396 | chrome_variables = dict() |
| 397 | if commit: |
| 398 | chrome_variables[_CHROME_SVN_TAG] = commit |
| 399 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 400 | portage_util.EBuild.MarkAsStable( |
David James | 065b201 | 2012-04-01 14:51:11 -0700 | [diff] [blame] | 401 | unstable_ebuild.ebuild_path, new_ebuild_path, |
David James | a679255 | 2012-04-03 10:05:35 -0700 | [diff] [blame] | 402 | chrome_variables, make_stable=mark_stable) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 403 | new_ebuild = ChromeEBuild(new_ebuild_path) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 404 | |
| 405 | # Determine whether this is ebuild is redundant. |
| 406 | if IsTheNewEBuildRedundant(new_ebuild, stable_candidate): |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 407 | msg = 'Previous ebuild with same version found and ebuild is redundant.' |
| 408 | cros_build_lib.Info(msg) |
Chris Sosa | 8be3913 | 2011-04-14 12:09:24 -0700 | [diff] [blame] | 409 | os.unlink(new_ebuild_path) |
| 410 | return None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 411 | |
Chris Sosa | dd611df | 2012-02-03 15:26:23 -0800 | [diff] [blame] | 412 | if stable_candidate and chrome_rev in _REV_TYPES_FOR_LINKS: |
Chris Masone | 592cab5 | 2011-08-02 14:05:48 -0700 | [diff] [blame] | 413 | _AnnotateAndPrint('Chromium revisions', |
| 414 | GetChromeRevisionListLink(stable_candidate, |
| 415 | new_ebuild, |
| 416 | chrome_rev)) |
| 417 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 418 | git.RunGit(package_dir, ['add', new_ebuild_path]) |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 419 | if stable_candidate and not stable_candidate.IsSticky(): |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 420 | git.RunGit(package_dir, ['rm', stable_candidate.ebuild_path]) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 421 | |
Alex Deymo | 075c229 | 2014-09-04 18:31:50 -0700 | [diff] [blame] | 422 | portage_util.EBuild.CommitChange( |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 423 | _GIT_COMMIT_MESSAGE % {'chrome_pn': chrome_pn, |
| 424 | 'chrome_rev': chrome_rev, |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 425 | 'chrome_version': chrome_version}, |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 426 | package_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 427 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 428 | return '%s-%s' % (new_ebuild.package, new_ebuild.version) |
| 429 | |
| 430 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 431 | def main(_argv): |
Chris Sosa | 0f295aa | 2011-10-21 14:10:28 -0700 | [diff] [blame] | 432 | usage_options = '|'.join(constants.VALID_CHROME_REVISIONS) |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 433 | usage = '%s OPTIONS [%s]' % (__file__, usage_options) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 434 | parser = optparse.OptionParser(usage) |
Yu-Ju Hong | 575b366 | 2014-08-05 13:33:41 -0700 | [diff] [blame] | 435 | parser.add_option('-b', '--boards', default=None) |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 436 | parser.add_option('-c', '--chrome_url', |
| 437 | default=constants.CHROMIUM_GOB_URL) |
David James | fb16001 | 2014-07-01 10:00:57 -0700 | [diff] [blame] | 438 | parser.add_option('-f', '--force_version', default=None, |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 439 | help='Chrome version or git revision hash to use') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 440 | parser.add_option('-s', '--srcroot', default=os.path.join(os.environ['HOME'], |
| 441 | 'trunk', 'src'), |
| 442 | help='Path to the src directory') |
| 443 | parser.add_option('-t', '--tracking_branch', default='cros/master', |
| 444 | help='Branch we are tracking changes against') |
| 445 | (options, args) = parser.parse_args() |
| 446 | |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 447 | if len(args) != 1 or args[0] not in constants.VALID_CHROME_REVISIONS: |
| 448 | parser.error('Commit requires arg set to one of %s.' |
| 449 | % constants.VALID_CHROME_REVISIONS) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 450 | |
David James | 9a5980e | 2014-07-16 09:37:00 -0700 | [diff] [blame] | 451 | if options.force_version and args[0] not in (constants.CHROME_REV_SPEC, |
| 452 | constants.CHROME_REV_LATEST): |
David James | fb16001 | 2014-07-01 10:00:57 -0700 | [diff] [blame] | 453 | parser.error('--force_version is not compatible with the %r ' |
| 454 | 'option.' % (args[0],)) |
| 455 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 456 | overlay_dir = os.path.abspath(_OVERLAY_DIR % {'srcroot': options.srcroot}) |
| 457 | chrome_package_dir = os.path.join(overlay_dir, constants.CHROME_CP) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 458 | chrome_rev = args[0] |
| 459 | version_to_uprev = None |
| 460 | commit_to_use = None |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 461 | sticky_branch = None |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 462 | |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 463 | (unstable_ebuild, stable_ebuilds) = FindChromeCandidates(chrome_package_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 464 | |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 465 | if chrome_rev == constants.CHROME_REV_LOCAL: |
| 466 | if 'CHROME_ROOT' in os.environ: |
| 467 | chrome_root = os.environ['CHROME_ROOT'] |
| 468 | else: |
| 469 | chrome_root = os.path.join(os.environ['HOME'], 'chrome_root') |
| 470 | |
| 471 | version_to_uprev = _GetTipOfTrunkVersionFile(chrome_root) |
| 472 | commit_to_use = 'Unknown' |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 473 | cros_build_lib.Info('Using local source, versioning is untrustworthy.') |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 474 | elif chrome_rev == constants.CHROME_REV_SPEC: |
David James | fb16001 | 2014-07-01 10:00:57 -0700 | [diff] [blame] | 475 | if '.' in options.force_version: |
| 476 | version_to_uprev = options.force_version |
| 477 | else: |
| 478 | commit_to_use = options.force_version |
| 479 | if '@' in commit_to_use: |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 480 | commit_to_use = commit_to_use.rpartition('@')[2] |
David James | fb16001 | 2014-07-01 10:00:57 -0700 | [diff] [blame] | 481 | version_to_uprev = _GetSpecificVersionUrl(options.chrome_url, |
| 482 | commit_to_use) |
Peter Mayo | 177500f | 2011-09-09 17:25:23 -0400 | [diff] [blame] | 483 | elif chrome_rev == constants.CHROME_REV_TOT: |
Stefan Zager | d49d9ff | 2014-08-15 21:33:37 -0700 | [diff] [blame] | 484 | commit_to_use = gob_util.GetTipOfTrunkRevision(options.chrome_url) |
petermayo@chromium.org | 163b337 | 2011-09-12 02:06:05 -0400 | [diff] [blame] | 485 | version_to_uprev = _GetSpecificVersionUrl(options.chrome_url, |
| 486 | commit_to_use) |
Ryan Cui | c6e097d | 2011-06-16 12:23:14 -0700 | [diff] [blame] | 487 | elif chrome_rev == constants.CHROME_REV_LATEST: |
David James | 9a5980e | 2014-07-16 09:37:00 -0700 | [diff] [blame] | 488 | if options.force_version: |
| 489 | if '.' not in options.force_version: |
| 490 | parser.error('%s only accepts released Chrome versions, not SVN or ' |
| 491 | 'Git revisions.' % (chrome_rev,)) |
| 492 | version_to_uprev = options.force_version |
| 493 | else: |
| 494 | version_to_uprev = GetLatestRelease(options.chrome_url) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 495 | else: |
Chris Sosa | 9ba4775 | 2012-02-27 15:27:37 -0800 | [diff] [blame] | 496 | sticky_ebuild = _GetStickyEBuild(stable_ebuilds) |
| 497 | sticky_version = sticky_ebuild.chrome_version |
| 498 | sticky_branch = sticky_version.rpartition('.')[0] |
Yu-Ju Hong | 3980632 | 2014-06-24 16:46:32 -0700 | [diff] [blame] | 499 | version_to_uprev = GetLatestRelease(options.chrome_url, sticky_branch) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 500 | |
| 501 | stable_candidate = FindChromeUprevCandidate(stable_ebuilds, chrome_rev, |
| 502 | sticky_branch) |
| 503 | |
| 504 | if stable_candidate: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 505 | cros_build_lib.Info('Stable candidate found %s' % stable_candidate) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 506 | else: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 507 | cros_build_lib.Info('No stable candidate found.') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 508 | |
Chris Sosa | 8049f3b | 2011-05-02 20:09:28 -0700 | [diff] [blame] | 509 | tracking_branch = 'remotes/m/%s' % os.path.basename(options.tracking_branch) |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 510 | existing_branch = git.GetCurrentBranch(chrome_package_dir) |
Ryan Cui | 05a31ba | 2011-05-31 17:47:37 -0700 | [diff] [blame] | 511 | work_branch = cros_mark_as_stable.GitBranch(constants.STABLE_EBUILD_BRANCH, |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 512 | tracking_branch, |
| 513 | chrome_package_dir) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 514 | work_branch.CreateBranch() |
David James | d6708c0 | 2012-03-22 10:49:15 -0700 | [diff] [blame] | 515 | |
| 516 | # In the case of uprevving overlays that have patches applied to them, |
| 517 | # include the patched changes in the stabilizing branch. |
| 518 | if existing_branch: |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 519 | git.RunGit(chrome_package_dir, ['rebase', existing_branch]) |
David James | d6708c0 | 2012-03-22 10:49:15 -0700 | [diff] [blame] | 520 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 521 | chrome_version_atom = MarkChromeEBuildAsStable( |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 522 | stable_candidate, unstable_ebuild, 'chromeos-chrome', chrome_rev, |
| 523 | version_to_uprev, commit_to_use, chrome_package_dir) |
Yu-Ju Hong | 078c9ec | 2014-08-06 18:25:16 -0700 | [diff] [blame] | 524 | if chrome_version_atom: |
| 525 | if options.boards: |
| 526 | cros_mark_as_stable.CleanStalePackages(options.boards.split(':'), |
| 527 | [chrome_version_atom]) |
David Zeuthen | 665d313 | 2014-08-25 15:27:02 -0400 | [diff] [blame] | 528 | |
| 529 | # If we did rev Chrome, now is a good time to uprev other packages. |
| 530 | for other_ebuild in constants.OTHER_CHROME_PACKAGES: |
| 531 | other_ebuild_name = os.path.basename(other_ebuild) |
| 532 | other_package_dir = os.path.join(overlay_dir, other_ebuild) |
| 533 | (other_unstable_ebuild, other_stable_ebuilds) = FindChromeCandidates( |
| 534 | other_package_dir) |
| 535 | other_stable_candidate = FindChromeUprevCandidate(other_stable_ebuilds, |
| 536 | chrome_rev, |
| 537 | sticky_branch) |
| 538 | revved_atom = MarkChromeEBuildAsStable(other_stable_candidate, |
| 539 | other_unstable_ebuild, |
| 540 | other_ebuild_name, |
| 541 | chrome_rev, version_to_uprev, |
| 542 | commit_to_use, other_package_dir) |
| 543 | if revved_atom and options.boards: |
| 544 | cros_mark_as_stable.CleanStalePackages(options.boards.split(':'), |
| 545 | [revved_atom]) |
| 546 | |
| 547 | # Explicit print to communicate to caller. |
| 548 | if chrome_version_atom: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 549 | print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom |