Revert stateful_change=clean and timeout=120.
--stateful_change=clean is stil broken. The chrome startup scripts try to copy the stateful partition to /tmp before cleaning. Which would be great except /tmp is a tmpfs (memory-based) file system and our stateful partition is pretty big. sosa is working on a fix, until then these two commits need to be rolled back:
http://codereview.chromium.org/6021006/
http://codereview.chromium.org/6516017/
Change-Id: If40ebf939c2c183729a8299e0001bfb15cdf1295
BUG=chromium-os:11971
TEST=Running now on cautotest.
Review URL: http://codereview.chromium.org/6480053
diff --git a/client/common_lib/cros/autoupdater.py b/client/common_lib/cros/autoupdater.py
index 0d0a5a6..244cbbd 100644
--- a/client/common_lib/cros/autoupdater.py
+++ b/client/common_lib/cros/autoupdater.py
@@ -117,11 +117,7 @@
# is testable after we run the autoupdater.
statefuldev_url = self.update_url.replace('update', 'static/archive')
- # --stateful_change=clean tells the updater to reset the stateful
- # partition to factory state; giving us a clean slate for testing.
- statefuldev_cmd = ' '.join([STATEFULDEV_UPDATER,
- '--stateful_change=clean',
- statefuldev_url,
+ statefuldev_cmd = ' '.join([STATEFULDEV_UPDATER, statefuldev_url,
'2>&1'])
logging.info(statefuldev_cmd)
try: