Merge remote branch 'cros/upstream' into master

client/tests/kvm/build.cfg.sample

 # Copy this file to build.cfg and edit it.
 #
 # This configuration file holds the KVM build test config parameters.
 # The default is noinstall (won't attempt to build KVM), so if you stick with it
 # please make sure:
 # 1) You have setup symbolic links to qemu and qemu-img binaries on the
 #    KVM test dir.
 # 2) The appropriate KVM modules are already loaded on your machine.
 
 variants:
     - build:
         type = build
         # Load modules built/installed by the build test?
         load_modules = no
         # Save the results of this build on test.resultsdir?
         save_results = no
         variants:
             - release:
-                mode = release
+                install_mode = release
                 ## Install from a kvm release. You can optionally specify
                 ## a release tag. If you omit it, the build test will get
                 ## the latest release tag available at that moment.
                 # release_tag = 84
                 release_dir = http://downloads.sourceforge.net/project/kvm/
                 release_listing = http://sourceforge.net/projects/kvm/files/
+                # In some cases, you might want to provide a ROM dir, so ROM
+                # files can be copied from there to your source based install
+                # path_to_rom_images = /usr/share/kvm
             - snapshot:
-                mode = snapshot
+                install_mode = snapshot
                 ## Install from a kvm snapshot location. You can optionally
                 ## specify a snapshot date. If you omit it, the test will get
                 ## yesterday's snapshot.
                 # snapshot_date = 20090712
                 snapshot_dir = http://foo.org/kvm-snapshots/
+                # In some cases, you might want to provide a ROM dir, so ROM
+                # files can be copied from there to your source based install
+                # path_to_rom_images = /usr/share/kvm
             - localtar:
-                mode = localtar
+                install_mode = localtar
                 ## Install from tarball located on the host's filesystem.
                 tarball = /tmp/kvm-84.tar.gz
+                # In some cases, you might want to provide a ROM dir, so ROM
+                # files can be copied from there to your source based install
+                # path_to_rom_images = /usr/share/kvm
             - localsrc:
-                mode = localsrc
+                install_mode = localsrc
                 ## Install from tarball located on the host's filesystem.
                 srcdir = /tmp/kvm-84
+                # In some cases, you might want to provide a ROM dir, so ROM
+                # files can be copied from there to your source based install
+                # path_to_rom_images = /usr/share/kvm
             - git:
-                mode = git
+                install_mode = git
                 ## Install KVM from git repositories.
                 ## If you provide only "git_repo" and "user_git_repo", the
                 ## build test will assume it will perform all build from the
                 ## userspace dir, building modules trough 
                 ## make -C kernel LINUX=%s sync. As of today (07-13-2009)
                 ## upstream needs 3 git repos:
                 ## * git_repo (linux sources)
                 ## * user_git_repo (qemu sources)
                 ## * kmod_repo" to build KVM userspace + kernel modules.
                 # git_repo = git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
                 # kernel_branch = kernel_branch_name
                 # kernel_lbranch = kernel_lbranch_name
                 # kernel_commit = kernel_commit_name
                 # kernel_patches = ['http://foo.com/patch1', 'http://foo.com/patch2']
                 user_git_repo = git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git
                 # user_branch = user_branch_name
                 # user_lbranch = user_lbranch_name
                 # user_commit = user_commit_name
                 # user_patches = ['http://foo.com/patch1', 'http://foo.com/patch2']
                 # kmod_repo = git://git.kernel.org/pub/scm/virt/kvm/kvm-kmod.git
                 # kmod_branch = kmod_branch_name
                 # kmod_lbranch = kmod_lbranch_name
                 # kmod_commit = kmod_commit_name
                 # kmod_patches = ['http://foo.com/patch1', 'http://foo.com/patch2']
+                # In some cases, you might want to provide a ROM dir, so ROM
+                # files can be copied from there to your source based install
+                # path_to_rom_images = /usr/share/kvm
             - yum:
-                mode = yum
+                install_mode = yum
                 src_pkg = qemu
                 ## Name of the rpms we need installed
                 pkg_list = ['qemu-kvm', 'qemu-kvm-tools', 'qemu-system-x86', 'qemu-common', 'qemu-img']
                 ## Paths of the qemu relevant executables that should be checked
                 qemu_bin_paths = ['/usr/bin/qemu-kvm', '/usr/bin/qemu-img']
                 ## List of RPMs that will be installed
                 pkg_path_list = ['http://foo.com/rpm1', 'http://foo.com/rpm2']
             - koji:
-                mode = koji
+                install_mode = koji
                 ## Install KVM from koji (Fedora build server)
                 ## It is possible to install packages right from Koji if you
                 ## provide a release tag or a build.
                 ## Tag (if available)
                 koji_tag = dist-f11
                 ## Build (if available, is going to override tag).
                 ## Build ID can be either an integer or a string as below
                 koji_build = qemu-0.10-16.fc11
                 # koji_build = 250544
                 ## Command to interact with the build server
                 koji_cmd = /usr/bin/koji
                 ## The name of the source package that will be built
                 src_pkg = qemu
                 ## Name of the rpms we need installed
                 pkg_list = ['qemu-kvm', 'qemu-kvm-tools', 'qemu-system-x86', 'qemu-common', 'qemu-img']
                 ## Paths of the qemu relevant executables that should be checked
                 qemu_bin_paths = ['/usr/bin/qemu-kvm', '/usr/bin/qemu-img']
 
 
 # Choose your install method here. The variant noinstall is not defined by
 # default, so therefore no attempt to build/install KVM will be made by
 # default
 only build.noinstall