Add stateful partition reset to upgrade process.

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
 
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import constants as chromeos_constants
 
-STATEFULDEV_UPDATER = '/usr/local/bin/stateful_update'
+# TODO(dalecurtis): HACK to bootstrap stateful updater until crosbug.com/8960 is
+# fixed.
+LOCAL_STATEFULDEV_UPDATER = ('/home/chromeos-test/chromeos-src/chromeos/src'
+                             '/platform/dev/stateful_update')
+STATEFULDEV_UPDATER = '/tmp/stateful_update'
 UPDATER_BIN = '/usr/bin/update_engine_client'
 UPDATER_IDLE = 'UPDATE_STATUS_IDLE'
 UPDATER_NEED_REBOOT = 'UPDATE_STATUS_UPDATED_NEED_REBOOT'
 UPDATED_MARKER = '/var/run/update_engine_autoupdate_completed'
 
 
 class ChromiumOSError(error.InstallError):
     """Generic error for ChromiumOS-specific exceptions."""
     pass
 
@@ skipping 85 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')
 
-        statefuldev_cmd = ' '.join([STATEFULDEV_UPDATER, statefuldev_url,
-                                    '2>&1'])
+        # TODO(dalecurtis): HACK to bootstrap stateful updater until
+        # crosbug.com/8960 is fixed.
+        self.host.send_file(LOCAL_STATEFULDEV_UPDATER, STATEFULDEV_UPDATER,
+                            delete_dest=True)
+        statefuldev_cmd = [STATEFULDEV_UPDATER, statefuldev_url]
+
+        # TODO(dalecurtis): HACK necessary until R10 builds are out of testing.
+        if int(self.update_version.split('.')[1]) > 10:
+            statefuldev_cmd.append('--stateful_change=clean')
+
+        statefuldev_cmd.append('2>&1')
+        statefuldev_cmd = ' '.join(statefuldev_cmd)
+
         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.' %
                                   self.host.hostname)
@@ skipping 29 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()