mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 15:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always pass board to cros_mark_as_stable.

Browse Source 
Change-Id: I9a724e4e20b8945fdaa1dc53afdddf2477a5bbab

BUG=
TEST=Ran unit tests.

Review URL: http://codereview.chromium.org/3956007
This commit is contained in:
Chris Sosa 2010-10-22 16:14:36 -07:00
parent d07981d619
commit 6b6f35ec65
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/cbuildbot.py
View File

@ -177,7 +177,7 @@ def _ParseRevisionString(revision_string, repo_dictionary):
return revisions.items() return revisions.items()
def _UprevFromRevisionList(buildroot, tracking_branch, revision_list): def _UprevFromRevisionList(buildroot, tracking_branch, revision_list, board):
"""Uprevs based on revision list.""" """Uprevs based on revision list."""
if not revision_list: if not revision_list:
Info('No packages found to uprev') Info('No packages found to uprev')
@ -191,16 +191,18 @@ def _UprevFromRevisionList(buildroot, tracking_branch, revision_list):
cwd = os.path.join(buildroot, 'src', 'scripts') cwd = os.path.join(buildroot, 'src', 'scripts')
RunCommand(['./cros_mark_as_stable', RunCommand(['./cros_mark_as_stable',
'--board=%s' % board,
'--tracking_branch="%s"' % tracking_branch, '--tracking_branch="%s"' % tracking_branch,
'--packages="%s"' % package_str, '--packages="%s"' % package_str,
'commit'], 'commit'],
cwd=cwd, enter_chroot=True) cwd=cwd, enter_chroot=True)
def _UprevAllPackages(buildroot, tracking_branch): def _UprevAllPackages(buildroot, tracking_branch, board):
"""Uprevs all packages that have been updated since last uprev.""" """Uprevs all packages that have been updated since last uprev."""
cwd = os.path.join(buildroot, 'src', 'scripts') cwd = os.path.join(buildroot, 'src', 'scripts')
RunCommand(['./cros_mark_as_stable', '--all', RunCommand(['./cros_mark_as_stable', '--all',
'--board=%s' % board,
'--tracking_branch="%s"' % tracking_branch, 'commit'], '--tracking_branch="%s"' % tracking_branch, 'commit'],
cwd=cwd, enter_chroot=True) cwd=cwd, enter_chroot=True)
@ -218,11 +220,12 @@ def _GetVMConstants(buildroot):
return (vdisk_size.strip(), statefulfs_size.strip()) return (vdisk_size.strip(), statefulfs_size.strip())
def _GitCleanup(buildroot): def _GitCleanup(buildroot, board):
"""Clean up git branch after previous uprev attempt.""" """Clean up git branch after previous uprev attempt."""
cwd = os.path.join(buildroot, 'src', 'scripts') cwd = os.path.join(buildroot, 'src', 'scripts')
if os.path.exists(cwd): if os.path.exists(cwd):
RunCommand(['./cros_mark_as_stable', '--srcroot=..', RunCommand(['./cros_mark_as_stable', '--srcroot=..',
'--board=%s' % board,
'--tracking_branch="cros/master"', 'clean'], '--tracking_branch="cros/master"', 'clean'],
cwd=cwd, error_ok=True) cwd=cwd, error_ok=True)
@ -246,9 +249,9 @@ def _WipeOldOutput(buildroot):
# =========================== Main Commands =================================== # =========================== Main Commands ===================================
def _PreFlightRinse(buildroot): def _PreFlightRinse(buildroot, board):
"""Cleans up any leftover state from previous runs.""" """Cleans up any leftover state from previous runs."""
_GitCleanup(buildroot) _GitCleanup(buildroot, board)
_CleanUpMountPoints(buildroot) _CleanUpMountPoints(buildroot)
RunCommand(['sudo', 'killall', 'kvm'], error_ok=True) RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
@ -359,16 +362,17 @@ def _UprevPackages(buildroot, tracking_branch, revisionfile, board):
# print >> sys.stderr, 'CBUILDBOT Revision list found %s' % revisions # print >> sys.stderr, 'CBUILDBOT Revision list found %s' % revisions
# revision_list = _ParseRevisionString(revisions, # revision_list = _ParseRevisionString(revisions,
# _CreateRepoDictionary(buildroot, board)) # _CreateRepoDictionary(buildroot, board))
# _UprevFromRevisionList(buildroot, tracking_branch, revision_list) # _UprevFromRevisionList(buildroot, tracking_branch, revision_list, board)
#else: #else:
Info('CBUILDBOT Revving all') Info('CBUILDBOT Revving all')
_UprevAllPackages(buildroot, tracking_branch) _UprevAllPackages(buildroot, tracking_branch, board)
def _UprevPush(buildroot, tracking_branch): def _UprevPush(buildroot, tracking_branch, board):
"""Pushes uprev changes to the main line.""" """Pushes uprev changes to the main line."""
cwd = os.path.join(buildroot, 'src', 'scripts') cwd = os.path.join(buildroot, 'src', 'scripts')
RunCommand(['./cros_mark_as_stable', '--srcroot=..', RunCommand(['./cros_mark_as_stable', '--srcroot=..',
'--board=%s' % board,
'--tracking_branch="%s"' % tracking_branch, '--tracking_branch="%s"' % tracking_branch,
'--push_options="--bypass-hooks -f"', 'push'], '--push_options="--bypass-hooks -f"', 'push'],
cwd=cwd) cwd=cwd)
@ -432,7 +436,7 @@ def main():
sys.exit(1) sys.exit(1)
try: try:
_PreFlightRinse(buildroot) _PreFlightRinse(buildroot, buildconfig['board'])
if options.clobber or not os.path.isdir(buildroot): if options.clobber or not os.path.isdir(buildroot):
_FullCheckout(buildroot, tracking_branch, url=options.url) _FullCheckout(buildroot, tracking_branch, url=options.url)
else: else:
@ -467,7 +471,7 @@ def main():
if buildconfig['master']: if buildconfig['master']:
# Master bot needs to check if the other slaves completed. # Master bot needs to check if the other slaves completed.
if cbuildbot_comm.HaveSlavesCompleted(config): if cbuildbot_comm.HaveSlavesCompleted(config):
_UprevPush(buildroot, tracking_branch) _UprevPush(buildroot, tracking_branch, buildconfig['board'])
else: else:
Die('CBUILDBOT - One of the slaves has failed!!!') Die('CBUILDBOT - One of the slaves has failed!!!')

2
cros_mark_as_stable.py
View File

@ -19,7 +19,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), 'lib'))
from cros_build_lib import Info, RunCommand, Warning, Die from cros_build_lib import Info, RunCommand, Warning, Die
gflags.DEFINE_string('board', 'x86-generic', gflags.DEFINE_string('board', '',
'Board for which the package belongs.', short_name='b') 'Board for which the package belongs.', short_name='b')
gflags.DEFINE_string('packages', '', gflags.DEFINE_string('packages', '',
'Space separated list of packages to mark as stable.', 'Space separated list of packages to mark as stable.',

9
cros_mark_as_stable_unittest.py
View File

@ -169,7 +169,8 @@ class EBuildStableMarkerTest(mox.MoxTestBase):
diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path, diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
self.revved_ebuild_path] self.revved_ebuild_path]
cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True, cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
print_cmd=False).AndReturn(1) print_cmd=False, redirect_stderr=True,
redirect_stdout=True).AndReturn(1)
cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path) cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path)
cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path) cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path)
@ -201,7 +202,8 @@ class EBuildStableMarkerTest(mox.MoxTestBase):
diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path, diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
self.revved_ebuild_path] self.revved_ebuild_path]
cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True, cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
print_cmd=False).AndReturn(0) print_cmd=False, redirect_stderr=True,
redirect_stdout=True).AndReturn(0)
cros_mark_as_stable.os.unlink(self.revved_ebuild_path) cros_mark_as_stable.os.unlink(self.revved_ebuild_path)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -234,7 +236,8 @@ class EBuildStableMarkerTest(mox.MoxTestBase):
diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path, diff_cmd = ['diff', '-Bu', self.m_ebuild.ebuild_path,
self.revved_ebuild_path] self.revved_ebuild_path]
cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True, cros_mark_as_stable.RunCommand(diff_cmd, exit_code=True,
print_cmd=False).AndReturn(1) print_cmd=False, redirect_stderr=True,
redirect_stdout=True).AndReturn(1)
cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path) cros_mark_as_stable._SimpleRunCommand('git add ' + self.revved_ebuild_path)
cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path) cros_mark_as_stable._SimpleRunCommand('git rm ' + self.m_ebuild.ebuild_path)