Revert stateful_change=clean and timeout=120.

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.

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=fb2b9f2

[sosa, 2011-02-15 00:10:33]

LGTM

On Mon, Feb 14, 2011 at 4:09 PM,  <dalecurtis@chromium.org> wrote:
> Reviewers: sosa, ericli,
>
> Description:
> 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.
>
> Please review this at http://codereview.chromium.org/6480053/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/autotest.git@master
>
> Affected files:
>  M client/common_lib/cros/autoupdater.py
>  M server/hosts/chromiumos_host.py
>
>
> Index: client/common_lib/cros/autoupdater.py
> diff --git a/client/common_lib/cros/autoupdater.py
> b/client/common_lib/cros/autoupdater.py
> index
>
0d0a5a6ac295f3258e0bd2cdd07c6bc8554428dc..244cbbdd117d6f9ec88c76f4f07641c2a52be77c
> 100644
> --- a/client/common_lib/cros/autoupdater.py
> +++ b/client/common_lib/cros/autoupdater.py
> @@ -117,11 +117,7 @@ class ChromiumOSUpdater():
>         # 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:
> Index: server/hosts/chromiumos_host.py
> diff --git a/server/hosts/chromiumos_host.py
> b/server/hosts/chromiumos_host.py
> index
>
83b5f7912617871f11f76386ae6058d0ada99643..183eb2a1cb50ecfb136009494fce7ea2a6103312
> 100644
> --- a/server/hosts/chromiumos_host.py
> +++ b/server/hosts/chromiumos_host.py
> @@ -36,6 +36,11 @@ class ChromiumOSHost(base_classes.Host):
>                                                 update_url=update_url)
>         updater.run_update()
>         # Updater has returned, successfully, reboot the host.
> -        self.reboot(timeout=120, wait=True)
> +        self.reboot(timeout=60, wait=True)
>         # Following the reboot, verify the correct version.
>         updater.check_version()
> +
> +        # Clean up any old autotest directories which may be lying around.
> +        for path in global_config.global_config.get_config_value(
> +                'AUTOSERV', 'client_autodir_paths', type=list):
> +            self.run('rm -rf ' + path)
>
>
>