mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 15:41:04 +02:00
Add a flag to pick up timestamp of commits and print information if found and add noclobber option for easier testing.
TEST=Ran cbuildbot with file. Review URL: http://codereview.chromium.org/3174021
This commit is contained in:
parent
d26c87d176
commit
81dae09de0
@ -17,10 +17,11 @@ _DEFAULT_RETRIES=3
|
||||
|
||||
# Utility functions
|
||||
|
||||
def RunCommand(cmd, error_ok=False, error_message=None, exit_code=False,
|
||||
redirect_stdout=False, redirect_stderr=False, cwd=None,
|
||||
input=None):
|
||||
def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
|
||||
exit_code=False, redirect_stdout=False, redirect_stderr=False,
|
||||
cwd=None, input=None):
|
||||
# Print out the command before running.
|
||||
if print_cmd:
|
||||
print >> sys.stderr, "CBUILDBOT -- RunCommand:", ' '.join(cmd)
|
||||
if redirect_stdout:
|
||||
stdout = subprocess.PIPE
|
||||
@ -98,12 +99,26 @@ def _Build(buildroot):
|
||||
cwd = os.path.join(buildroot, 'src', 'scripts')
|
||||
RunCommand(['./build_packages'], cwd=cwd)
|
||||
|
||||
def _UprevPackages(buildroot):
|
||||
def _UprevAllPackages(buildroot):
|
||||
cwd = os.path.join(buildroot, 'src', 'scripts')
|
||||
RunCommand(['./enter_chroot.sh', '--', './cros_mark_all_as_stable',
|
||||
'--tracking_branch="cros/master"'],
|
||||
cwd=cwd)
|
||||
|
||||
def _UprevPackages(buildroot, revisionfile):
|
||||
revisions = None
|
||||
if (revision_file):
|
||||
rev_file = revisionfile.open(revisionfile)
|
||||
revisions = rev_file.read()
|
||||
rev_file.close()
|
||||
|
||||
# Note: Revisions == "None" indicates a Force Build.
|
||||
if revisions and revisions != 'None':
|
||||
print 'CBUILDBOT - Revision list found %s' % revisions
|
||||
print 'Revision list not yet propagating to build, marking all instead'
|
||||
|
||||
_UprevAllPackages(buildroot)
|
||||
|
||||
def _UprevCleanup(buildroot):
|
||||
cwd = os.path.join(buildroot, 'src', 'scripts')
|
||||
RunCommand(['./cros_mark_as_stable', '--srcroot=..',
|
||||
@ -135,9 +150,17 @@ def main():
|
||||
help='root directory where build occurs', default=".")
|
||||
parser.add_option('-n', '--buildnumber',
|
||||
help='build number', type='int', default=0)
|
||||
parser.add_option('-f', '--revisionfile',
|
||||
help='file where new revisions are stored')
|
||||
parser.add_option('--noclobber', action='store_false', dest='clobber',
|
||||
default=True,
|
||||
help='Disables clobbering the buildroot on failure')
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
buildroot = options.buildroot
|
||||
revisionfile = options.revisionfile
|
||||
clobber = options.clobber
|
||||
|
||||
if len(args) == 1:
|
||||
buildconfig = _GetConfig(args[0])
|
||||
else:
|
||||
@ -156,14 +179,15 @@ def main():
|
||||
if not os.path.isdir(boardpath):
|
||||
_SetupBoard(buildroot, board=buildconfig['board'])
|
||||
if buildconfig['uprev']:
|
||||
_UprevPackages(buildroot)
|
||||
_UprevPackages(buildroot, revisionfile)
|
||||
_Build(buildroot)
|
||||
if buildconfig['uprev']:
|
||||
_UprevPush(buildroot)
|
||||
_UprevCleanup(buildroot)
|
||||
except:
|
||||
# something went wrong, cleanup (being paranoid) for next build
|
||||
RunCommand(['sudo', 'rm', '-rf', buildroot])
|
||||
if clobber:
|
||||
RunCommand(['sudo', 'rm', '-rf', buildroot], print_cmd=False)
|
||||
raise
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Loading…
x
Reference in New Issue
Block a user