mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 07:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix issue with stale cache from bad builds."

Browse Source 
This reverts commit 365d4b0cc8b21204e6e093bf910d53d3673f113c.

Fix preflight breakage, this seems like the most possible cause. Will recommit if not.

BUG=
TEST=

Review URL: http://codereview.chromium.org/3767012

Change-Id: I93fe463fec77c445e7ff0ec86db25d5ef2997ad7
This commit is contained in:
Anush Elangovan 2010-10-15 11:36:53 -07:00
parent ccfa2ac970
commit 189d85d20e
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/cbuildbot.py
View File

@ -345,14 +345,6 @@ def _UprevCleanup(buildroot, error_ok=False):
'--tracking_branch="cros/master"', 'clean'], '--tracking_branch="cros/master"', 'clean'],
cwd=cwd, error_ok=error_ok) cwd=cwd, error_ok=error_ok)
workon_packages = RunCommand(['./cros_workon', 'list'],
enter_chroot=True, cwd=cwd, error_ok=error_ok,
redirect_stdout=True)
if workon_packages:
Info('Cleaning up workon packages %s' % workon_packages)
RunCommand(['./cros_workon', 'stop'] + workon_packages.split(),
enter_chroot=True, cwd=cwd, error_ok=False)
def _UprevPush(buildroot): def _UprevPush(buildroot):
"""Pushes uprev changes to the main line.""" """Pushes uprev changes to the main line."""
@ -447,6 +439,7 @@ def main():
# 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) _UprevPush(buildroot)
_UprevCleanup(buildroot)
else: else:
# At least one of the slaves failed or we timed out. # At least one of the slaves failed or we timed out.
_UprevCleanup(buildroot) _UprevCleanup(buildroot)
@ -456,7 +449,7 @@ def main():
if buildconfig['important']: if buildconfig['important']:
cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE) cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
_UprevCleanup(buildroot) _UprevCleanup(buildroot)
except: except:
# Send failure to master bot. # Send failure to master bot.
if not buildconfig['master'] and buildconfig['important']: if not buildconfig['master'] and buildconfig['important']:

2
cros_mark_all_as_stable
View File

@ -99,8 +99,6 @@ if [ -n "${PACKAGE_LIST}" ] ; then
./cros_mark_as_stable --board ${FLAGS_board} -p "${PACKAGE_LIST}" \ ./cros_mark_as_stable --board ${FLAGS_board} -p "${PACKAGE_LIST}" \
-i "${COMMIT_ID_LIST}" -t ${FLAGS_tracking_branch} commit || \ -i "${COMMIT_ID_LIST}" -t ${FLAGS_tracking_branch} commit || \
die "Could not mark all packages as stable" die "Could not mark all packages as stable"
./cros_workon start ${PACKAGE_LIST}
else else
info "No candidate packages to be marked" info "No candidate packages to be marked"
fi fi

3
cros_mark_as_stable.py
View File

@ -123,8 +123,7 @@ def _PrintUsageAndDie(error_message=''):
command_usage += ' %s: %s\n' % (command, _COMMAND_DICTIONARY[command]) command_usage += ' %s: %s\n' % (command, _COMMAND_DICTIONARY[command])
commands_str = '|'.join(commands) commands_str = '|'.join(commands)
Warning('Usage: %s FLAGS [%s]\n\n%s\nFlags:%s' % (sys.argv[0], commands_str, Warning('Usage: %s FLAGS [%s]\n\n%s\nFlags:%s' % (sys.argv[0], commands_str,
command_usage, command_usage, gflags.FLAGS))
gflags.FLAGS))
if error_message: if error_message:
Die(error_message) Die(error_message)
else: else: