Revert stateful_change=clean and timeout=120.

client/common_lib/cros/autoupdater.py

 # 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.
 
 import httplib
 import logging
 import re
 import socket
 import urlparse
 
@@ skipping 99 matching lines @@
         if status != UPDATER_NEED_REBOOT:
             raise ChromiumOSError('update-engine error on %s: '
                                   '"%s" from update-engine' %
                                   (self.host.hostname, status))
 
         # Attempt dev & test tools update (which don't live on the
         # rootfs). This must succeed so that the newly installed host
         # 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:
             self._run(statefuldev_cmd, timeout=600)
         except error.AutoservRunError, e:
             # TODO(seano): If statefuldev update failed, we must mark
             # the update as failed, and keep the same rootfs after
             # reboot.
             self.revert_boot_partition()
             raise ChromiumOSError('stateful_update failed on %s.' %
@@ skipping 30 matching lines @@
                 builder_num = '-b%s' % build_match.group(1)
             else:
                 builder_num = ''
             return '%s-r%s%s' % (version, build_id, builder_num)
 
 
     def get_dev_build_id(self):
         """Pulls the CHROMEOS_RELEASE_VERSION string from /etc/lsb-release."""
         return self._run('grep CHROMEOS_RELEASE_VERSION'
                          ' /etc/lsb-release').stdout.split('=')[1].strip()