Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: bin/cros_mark_chrome_as_stable.py

Issue 6286040: Remove buildbot code that has been added to chromite. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Verify Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bin/cros_mark_chrome_as_stable ('k') | bin/cros_mark_chrome_as_stable_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cros_mark_chrome_as_stable.py
diff --git a/bin/cros_mark_chrome_as_stable.py b/bin/cros_mark_chrome_as_stable.py
deleted file mode 100755
index 2d88d58b628c7db85adcd36ef4b9ec075e609382..0000000000000000000000000000000000000000
--- a/bin/cros_mark_chrome_as_stable.py
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""This module uprevs Chrome for cbuildbot.
-
-After calling, it prints outs CHROME_VERSION_ATOM=(version atom string). A
-caller could then use this atom with emerge to build the newly uprevved version
-of Chrome e.g.
-
-./cros_mark_chrome_as_stable tot
-Returns chrome-base/chromeos-chrome-8.0.552.0_alpha_r1
-
-emerge-x86-generic =chrome-base/chromeos-chrome-8.0.552.0_alpha_r1
-"""
-
-import optparse
-import os
-import re
-import sys
-import urllib
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-import cros_mark_as_stable
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
-from cros_build_lib import RunCommand, Info, Warning
-
-BASE_CHROME_SVN_URL = 'http://src.chromium.org/svn'
-
-# Command for which chrome ebuild to uprev.
-TIP_OF_TRUNK, LATEST_RELEASE, STICKY = 'tot', 'latest_release', 'stable_release'
-CHROME_REV = [TIP_OF_TRUNK, LATEST_RELEASE, STICKY]
-
-# Helper regex's for finding ebuilds.
-_CHROME_VERSION_REGEX = '\d+\.\d+\.\d+\.\d+'
-_NON_STICKY_REGEX = '%s[(_rc.*)|(_alpha.*)]+' % _CHROME_VERSION_REGEX
-
-# Dir where all the action happens.
-_CHROME_OVERLAY_DIR = ('%(srcroot)s/third_party/chromiumos-overlay'
- '/chromeos-base/chromeos-chrome')
-
-_GIT_COMMIT_MESSAGE = ('Marking %(chrome_rev)s for chrome ebuild with version '
- '%(chrome_version)s as stable.')
-
-
-def _GetSvnUrl():
- """Returns the path to the svn url for the given chrome branch."""
- return os.path.join(BASE_CHROME_SVN_URL, 'trunk')
-
-
-def _GetTipOfTrunkSvnRevision():
- """Returns the current svn revision for the chrome tree."""
- svn_url = _GetSvnUrl()
- svn_info = RunCommand(['svn', 'info', svn_url], redirect_stdout=True)
-
- revision_re = re.compile('^Revision:\s+(\d+).*')
- for line in svn_info.splitlines():
- match = revision_re.search(line)
- if match:
- svn_revision = match.group(1)
- Info('Using SVN Revision %s' % svn_revision)
- return svn_revision
-
- raise Exception('Could not find revision information from %s' % svn_url)
-
-
-def _GetTipOfTrunkVersion():
- """Returns the current Chrome version."""
- svn_url = _GetSvnUrl()
- chrome_version_file = urllib.urlopen(os.path.join(svn_url, 'src', 'chrome',
- 'VERSION'))
- chrome_version_info = chrome_version_file.read()
- chrome_version_file.close()
-
- # Sanity check.
- if '404 Not Found' in chrome_version_info:
- raise Exception('Url %s does not have version file.' % svn_url)
-
- chrome_version_array = []
-
- for line in chrome_version_info.splitlines():
- chrome_version_array.append(line.rpartition('=')[2])
-
- return '.'.join(chrome_version_array)
-
-
-def _GetLatestRelease(branch=None):
- """Gets the latest release version from the buildspec_url for the branch.
-
- Args:
- branch: If set, gets the latest release for branch, otherwise latest
- release.
- Returns:
- Latest version string.
- """
- buildspec_url = 'http://src.chromium.org/svn/releases'
- svn_ls = RunCommand(['svn', 'ls', buildspec_url], redirect_stdout=True)
- sorted_ls = RunCommand(['sort', '--version-sort'], input=svn_ls,
- redirect_stdout=True)
- if branch:
- chrome_version_re = re.compile('^%s\.\d+.*' % branch)
- else:
- chrome_version_re = re.compile('^[0-9]+\..*')
- for chrome_version in sorted_ls.splitlines():
- if chrome_version_re.match(chrome_version):
- current_version = chrome_version
-
- return current_version.rstrip('/')
-
-
-def _GetStickyEBuild(stable_ebuilds):
- """Returns the sticky ebuild."""
- sticky_ebuilds = []
- non_sticky_re = re.compile(_NON_STICKY_REGEX)
- for ebuild in stable_ebuilds:
- if not non_sticky_re.match(ebuild.version):
- sticky_ebuilds.append(ebuild)
-
- if not sticky_ebuilds:
- raise Exception('No sticky ebuilds found')
- elif len(sticky_ebuilds) > 1:
- Warning('More than one sticky ebuild found')
-
- return cros_mark_as_stable.BestEBuild(sticky_ebuilds)
-
-
-class ChromeEBuild(cros_mark_as_stable.EBuild):
- """Thin sub-class of EBuild that adds a chrome_version field."""
- chrome_version_re = re.compile('.*chromeos-chrome-(%s|9999).*' % (
- _CHROME_VERSION_REGEX))
- chrome_version = ''
-
- def __init__(self, path):
- cros_mark_as_stable.EBuild.__init__(self, path)
- re_match = self.chrome_version_re.match(self.ebuild_path_no_revision)
- if re_match:
- self.chrome_version = re_match.group(1)
-
- def __cmp__(self, other):
- """Use ebuild paths for comparison."""
- if self.ebuild_path == other.ebuild_path:
- return 0
- elif self.ebuild_path > other.ebuild_path:
- return 1
- else:
- return (-1)
-
- def __str__(self):
- return self.ebuild_path
-
-
-def FindChromeCandidates(overlay_dir):
- """Return a tuple of chrome's unstable ebuild and stable ebuilds.
-
- Args:
- overlay_dir: The path to chrome's portage overlay dir.
- Returns:
- Tuple [unstable_ebuild, stable_ebuilds].
- Raises:
- Exception: if no unstable ebuild exists for Chrome.
- """
- stable_ebuilds = []
- unstable_ebuilds = []
- for path in [
- os.path.join(overlay_dir, entry) for entry in os.listdir(overlay_dir)]:
- if path.endswith('.ebuild'):
- ebuild = ChromeEBuild(path)
- if not ebuild.chrome_version:
- Warning('Poorly formatted ebuild found at %s' % path)
- else:
- if '9999' in ebuild.version:
- unstable_ebuilds.append(ebuild)
- else:
- stable_ebuilds.append(ebuild)
-
- # Apply some sanity checks.
- if not unstable_ebuilds:
- raise Exception('Missing 9999 ebuild for %s' % overlay_dir)
- if not stable_ebuilds:
- Warning('Missing stable ebuild for %s' % overlay_dir)
-
- return cros_mark_as_stable.BestEBuild(unstable_ebuilds), stable_ebuilds
-
-
-def FindChromeUprevCandidate(stable_ebuilds, chrome_rev, sticky_branch):
- """Finds the Chrome uprev candidate for the given chrome_rev.
-
- Using the pre-flight logic, this means the stable ebuild you are uprevving
- from. The difference here is that the version could be different and in
- that case we want to find it to delete it.
-
- Args:
- stable_ebuilds: A list of stable ebuilds.
- chrome_rev: The chrome_rev designating which candidate to find.
- sticky_branch: The the branch that is currently sticky with Major/Minor
- components. For example: 9.0.553
- Returns:
- Returns the EBuild, otherwise None if none found.
- """
- candidates = []
- if chrome_rev == TIP_OF_TRUNK:
- chrome_branch_re = re.compile('%s.*_alpha.*' % _CHROME_VERSION_REGEX)
- for ebuild in stable_ebuilds:
- if chrome_branch_re.search(ebuild.version):
- candidates.append(ebuild)
-
- elif chrome_rev == STICKY:
- chrome_branch_re = re.compile('%s\..*' % sticky_branch)
- for ebuild in stable_ebuilds:
- if chrome_branch_re.search(ebuild.version):
- candidates.append(ebuild)
-
- else:
- chrome_branch_re = re.compile('%s.*_rc.*' % _CHROME_VERSION_REGEX)
- for ebuild in stable_ebuilds:
- if chrome_branch_re.search(ebuild.version) and (
- not ebuild.chrome_version.startswith(sticky_branch)):
- candidates.append(ebuild)
-
- if candidates:
- return cros_mark_as_stable.BestEBuild(candidates)
- else:
- return None
-
-
-def MarkChromeEBuildAsStable(stable_candidate, unstable_ebuild, chrome_rev,
- chrome_version, commit, overlay_dir,
- sticky_ebuild):
- """Uprevs the chrome ebuild specified by chrome_rev.
-
- This is the main function that uprevs the chrome_rev from a stable candidate
- to its new version.
-
- Args:
- stable_candidate: ebuild that corresponds to the stable ebuild we are
- revving from. If None, builds the a new ebuild given the version
- and logic for chrome_rev type with revision set to 1.
- unstable_ebuild: ebuild corresponding to the unstable ebuild for chrome.
- chrome_rev: one of CHROME_REV
- TIP_OF_TRUNK - Requires commit value. Revs the ebuild for the TOT
- version and uses the portage suffix of _alpha.
- LATEST_RELEASE - This uses the portage suffix of _rc as they are release
- candidates for the next sticky version.
- STICKY - Revs the sticky version.
- chrome_version: The \d.\d.\d.\d version of Chrome.
- commit: Used with TIP_OF_TRUNK. The svn revision of chrome.
- overlay_dir: Path to the chromeos-chrome package dir.
- sticky_ebuild: EBuild class for the sticky ebuild.
- Returns:
- Full portage version atom (including rc's, etc) that was revved.
- """
- base_path = os.path.join(overlay_dir, 'chromeos-chrome-%s' % chrome_version)
- # Case where we have the last stable candidate with same version just rev.
- if stable_candidate and stable_candidate.chrome_version == chrome_version:
- new_ebuild_path = '%s-r%d.ebuild' % (
- stable_candidate.ebuild_path_no_revision,
- stable_candidate.current_revision + 1)
- else:
- if chrome_rev == TIP_OF_TRUNK:
- portage_suffix = '_alpha'
- else:
- portage_suffix = '_rc'
-
- new_ebuild_path = base_path + ('%s-r1.ebuild' % portage_suffix)
-
- # Mark latest release and sticky branches as stable.
- mark_stable = chrome_rev != TIP_OF_TRUNK
-
- cros_mark_as_stable.EBuildStableMarker.MarkAsStable(
- unstable_ebuild.ebuild_path, new_ebuild_path, 'CROS_SVN_COMMIT', commit,
- make_stable=mark_stable)
- new_ebuild = ChromeEBuild(new_ebuild_path)
- if stable_candidate and (
- stable_candidate.chrome_version == new_ebuild.chrome_version):
- if 0 == RunCommand(['diff', '-Bu', stable_candidate.ebuild_path,
- new_ebuild_path],
- redirect_stderr=True,
- redirect_stdout=True,
- exit_code=True):
- Info('Previous ebuild with same version found and no 9999 changes found.'
- ' Nothing to do.')
- os.unlink(new_ebuild_path)
- return None
-
- RunCommand(['git', 'add', new_ebuild_path])
- if stable_candidate and stable_candidate != sticky_ebuild:
- RunCommand(['git', 'rm', stable_candidate.ebuild_path])
-
- cros_mark_as_stable.EBuildStableMarker.CommitChange(
- _GIT_COMMIT_MESSAGE % {'chrome_rev': chrome_rev,
- 'chrome_version': chrome_version})
-
- new_ebuild = ChromeEBuild(new_ebuild_path)
- return '%s-%s' % (new_ebuild.package, new_ebuild.version)
-
-
-def main():
- usage = '%s OPTIONS [%s]' % (__file__, '|'.join(CHROME_REV))
- parser = optparse.OptionParser(usage)
- parser.add_option('-s', '--srcroot', default=os.path.join(os.environ['HOME'],
- 'trunk', 'src'),
- help='Path to the src directory')
- parser.add_option('-t', '--tracking_branch', default='cros/master',
- help='Branch we are tracking changes against')
- (options, args) = parser.parse_args()
-
- if len(args) != 1 or args[0] not in CHROME_REV:
- parser.error('Commit requires arg set to one of %s.' % CHROME_REV)
-
- overlay_dir = os.path.abspath(_CHROME_OVERLAY_DIR %
- {'srcroot': options.srcroot})
- chrome_rev = args[0]
- version_to_uprev = None
- commit_to_use = None
-
- (unstable_ebuild, stable_ebuilds) = FindChromeCandidates(overlay_dir)
- sticky_ebuild = _GetStickyEBuild(stable_ebuilds)
- sticky_version = sticky_ebuild.chrome_version
- sticky_branch = sticky_version.rpartition('.')[0]
-
- if chrome_rev == TIP_OF_TRUNK:
- version_to_uprev = _GetTipOfTrunkVersion()
- commit_to_use = _GetTipOfTrunkSvnRevision()
- elif chrome_rev == LATEST_RELEASE:
- version_to_uprev = _GetLatestRelease()
- # Don't rev on stable branch for latest_release.
- if re.match('%s\.\d+' % sticky_branch, version_to_uprev):
- Info('Latest release is sticky branch. Nothing to do.')
- return
- else:
- version_to_uprev = _GetLatestRelease(sticky_branch)
-
- stable_candidate = FindChromeUprevCandidate(stable_ebuilds, chrome_rev,
- sticky_branch)
-
- if stable_candidate:
- Info('Stable candidate found %s' % stable_candidate)
- else:
- Info('No stable candidate found.')
-
- os.chdir(overlay_dir)
- work_branch = cros_mark_as_stable.GitBranch(
- cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
- work_branch.CreateBranch()
- chrome_version_atom = MarkChromeEBuildAsStable(
- stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
- commit_to_use, overlay_dir, sticky_ebuild)
- # Explicit print to communicate to caller.
- if chrome_version_atom:
- print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
-
-
-if __name__ == '__main__':
- main()
« no previous file with comments | « bin/cros_mark_chrome_as_stable ('k') | bin/cros_mark_chrome_as_stable_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698