Merge pull request #1425 from luckyh/fix-kernel-update

rh_kernel_update: Improve the test

qemu/tests/cfg/rh_kernel_update.cfg

-#Notes:
-#     Before start please modify test configuration according your
-# test enviroment. eg.
-#     		methed =
-#     		brewtag =
-#     		download_root_url =
-#     		kernel_re =
-#     		kernel_build_name =
-#     		knl_dbginfo_re =
-# and so on.
 - rh_kernel_update:
     only RHEL
     only Host_RHEL
     only i386 x86_64 PAE ppc64 ppc64le aarch64 s390x
-    no RHEL.3.9
     type = rh_kernel_update
     start_vm = yes
     kill_vm = yes
     image_snapshot = yes
-    rpm_timeout = 1200
     # Please update your file share web server url before test
-    download_root_url = "http://download.xxx.com"
-    ## Please set install_rpm_from_local, if want copy rpm to guest, then install it.
-    # install_rpm_from_local = yes
-    # kernel_version, kernel_rpm will be used when set method to link.
-    # These two parameters are set at bottom of this file when udpating this patch.
-    # kernel_version =
-    # kernel_rpm =
-    args_removed = "rhgb quiet"
-    args_added = "console=ttyS0,115200 console=tty0"
-    method = brew
+    #download_root_url = <your_server_url>
     # brew tag for search latest package via brewtool
-    brew_tag = "rhel-latest"
+    #brew_tag = <brew_tag>
     kernel_build_name = "kernel"
-    install_virtio = no
-    verify_virtio = no
-    virtio_drivers_list = "virtio virtio_ring virtio_pci"
-    s390x:
-        virtio_drivers_list = ""
-        update_kernel_cmd = "zipl"
-    upgrade_pkgs = glibc
+    kernel_pkgs = kernel
     kernel_deps_pkgs = dracut xfsprogs
+    upgrade_pkgs = glibc
+    RHEL.5:
+        kernel_rel_pattern = "{v_r}"
+        upgrade_pkgs = ""
     RHEL.6:
-        arch_dracut = noarch
+        kernel_pkgs += " kernel-firmware"
+        pkg_arch_kernel-firmware = noarch
+        pkg_arch_dracut = noarch
     RHEL.7:
+        kernel_deps_pkgs += " kmod hmaccalc"
         upgrade_pkgs += " qemu-guest-agent"
-        kernel_deps_pkgs += " kmod"
+    x86_64:
+        pkg_arch = x86_64
+    i386:
+        pkg_arch = i686
+    PAE:
+        pkg_arch = i686
+        kernel_rel_pattern = "{v_r}PAE"
+    ppc64:
+        pkg_arch = ppc64
+    ppc64le:
+        pkg_arch = ppc64le
+    aarch64:
+        pkg_arch = aarch64
+    s390x:
+        pkg_arch = s390x
+    s390x:
+        virtio_drivers_list = ""
+        update_kernel_cmd = "zipl"
+    args_removed = "rhgb quiet"
+    args_added = "console=ttyS0,115200 console=tty0"
+    install_virtio = no
+    verify_virtio = no
+    virtio_drivers_list = "virtio virtio_ring virtio_pci"
     ignore_deps = yes
     install_debuginfo = no
     install_pkg_timeout = 600
@@ -56,23 +58,3 @@
         virtio_drivers_list += " virtio_blk"
         install_virtio = yes
         verify_virtio = yes
-    x86_64:
-        kernel_re = .*kernel-%s.el[^.]+\.x86_64.*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.x86_64.*
-    PAE:
-        kernel_re = .*kernel-PAE-%s.el[^.]+\.i686.*
-    i386:
-        kernel_re = .*kernel-%s.el[^.]+\.i686.*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.i686.*
-    ppc64:
-        kernel_re = .*kernel-%s.el[^.]+\.ppc64\..*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.ppc64\..*
-    ppc64le:
-        kernel_re = .*kernel-%s.el[^.]+\.ppc64le.*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.ppc64le.*
-    aarch64:
-        kernel_re = .*kernel-%s.el[^.]+\.aarch64.*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.aarch64.*
-    s390x:
-        kernel_re = .*kernel-%s.el[^.]+\.s390x.*
-        knl_dbginfo_re = .*kernel-debuginfo-.*.el[^.]+\.s390x.*