Merge remote branch 'autotest-upstream/master' into autotest-merge

client/tests/kvm/installer.py

Index: client/tests/kvm/installer.py
diff --git a/client/tests/kvm/installer.py b/client/tests/kvm/installer.py
index 6b2a6fe01fe8d3f82150b8dfb783dc06de2e74e4..8026d6ddbd92c5a409c23e666afd5291bb9b07cd 100644
--- a/client/tests/kvm/installer.py
+++ b/client/tests/kvm/installer.py
@@ -392,7 +392,9 @@ class YumInstaller(BaseInstaller):
 class KojiInstaller(YumInstaller):
     """
     Class that handles installing KVM from the fedora build service, koji.
-    It uses yum to install and remove packages.
+
+    It uses yum to install and remove packages. Packages are specified
+    according to the syntax defined in the PkgSpec class.
     """
     load_stock_modules = True
     def set_install_params(self, test, params):
@@ -403,27 +405,37 @@ class KojiInstaller(YumInstaller):
         @param params: Dictionary with test arguments
         """
         super(KojiInstaller, self).set_install_params(test, params)
-        default_koji_cmd = '/usr/bin/koji'
-        default_src_pkg = 'qemu'
-        self.src_pkg = params.get("src_pkg", default_src_pkg)
         self.tag = params.get("koji_tag", None)
-        self.build = params.get("koji_build", None)
-        self.koji_cmd = params.get("koji_cmd", default_koji_cmd)
+        self.koji_cmd = params.get("koji_cmd", None)
+        if self.tag is not None:
+            kvm_utils.set_default_koji_tag(self.tag)
+        self.koji_pkgs = eval(params.get("koji_pkgs", "[]"))
 
 
     def _get_packages(self):
         """
         Downloads the specific arch RPMs for the specific build name.
         """
-        downloader = kvm_utils.KojiDownloader(cmd=self.koji_cmd)
-        downloader.get(src_package=self.src_pkg, tag=self.tag,
-                            build=self.build, dst_dir=self.srcdir)
+        koji_client = kvm_utils.KojiClient(cmd=self.koji_cmd)
+        for pkg_text in self.koji_pkgs:
+            pkg = kvm_utils.KojiPkgSpec(pkg_text)
+            if pkg.is_valid():
+                koji_client.get_pkgs(pkg, dst_dir=self.srcdir)
+            else:
+                logging.error('Package specification (%s) is invalid: %s', pkg,
+                              pkg.describe_invalid())
+
+
+    def _clean_previous_installs(self):
+        kill_qemu_processes()
+        removable_packages = " ".join(self._get_rpm_names())
+        utils.system("yum -y remove %s" % removable_packages)
 
 
     def install(self):
-        super(KojiInstaller, self)._clean_previous_installs()
+        self._clean_previous_installs()
         self._get_packages()
-        super(KojiInstaller, self)._install_packages()
+        self._install_packages()
         self.install_unittests()
         create_symlinks(test_bindir=self.test_bindir,
                         bin_list=self.qemu_bin_paths,
@@ -433,6 +445,35 @@ class KojiInstaller(YumInstaller):
             save_build(self.srcdir, self.results_dir)
 
 
+    def _get_rpm_names(self):
+        all_rpm_names = []
+        koji_client = kvm_utils.KojiClient(cmd=self.koji_cmd)
+        for pkg_text in self.koji_pkgs:
+            pkg = kvm_utils.KojiPkgSpec(pkg_text)
+            rpm_names = koji_client.get_pkg_rpm_names(pkg)
+            all_rpm_names += rpm_names
+        return all_rpm_names
+
+
+    def _get_rpm_file_names(self):
+        all_rpm_file_names = []
+        koji_client = kvm_utils.KojiClient(cmd=self.koji_cmd)
+        for pkg_text in self.koji_pkgs:
+            pkg = kvm_utils.KojiPkgSpec(pkg_text)
+            rpm_file_names = koji_client.get_pkg_rpm_file_names(pkg)
+            all_rpm_file_names += rpm_file_names
+        return all_rpm_file_names
+
+
+    def _install_packages(self):
+        """
+        Install all downloaded packages.
+        """
+        os.chdir(self.srcdir)
+        rpm_file_names = " ".join(self._get_rpm_file_names())
+        utils.system("yum --nogpgcheck -y localinstall %s" % rpm_file_names)
+
+
 class SourceDirInstaller(BaseInstaller):
     """
     Class that handles building/installing KVM directly from a tarball or
@@ -639,7 +680,7 @@ class GitInstaller(SourceDirInstaller):
             for patch in user_patches:
                 utils.get_file(patch, os.path.join(self.userspace_srcdir,
                                                    os.path.basename(patch)))
-                utils.system('patch -p1 %s' % os.path.basename(patch))
+                utils.system('patch -p1 < %s' % os.path.basename(patch))
 
         if kernel_repo:
             kernel_srcdir = os.path.join(self.srcdir, "kvm")
@@ -651,7 +692,7 @@ class GitInstaller(SourceDirInstaller):
                 for patch in kernel_patches:
                     utils.get_file(patch, os.path.join(self.userspace_srcdir,
                                                        os.path.basename(patch)))
-                    utils.system('patch -p1 %s' % os.path.basename(patch))
+                    utils.system('patch -p1 < %s' % os.path.basename(patch))
         else:
             self.kernel_srcdir = None
 
@@ -665,7 +706,7 @@ class GitInstaller(SourceDirInstaller):
                 for patch in kmod_patches:
                     utils.get_file(patch, os.path.join(self.userspace_srcdir,
                                                        os.path.basename(patch)))
-                    utils.system('patch -p1 %s' % os.path.basename(patch))
+                    utils.system('patch -p1 < %s' % os.path.basename(patch))
         else:
             self.kmod_srcdir = None