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