As usual, make it the default guest on the default
kvm autotest run.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
client/tests/kvm/get_started.py | 6 +++---
client/tests/kvm/tests.cfg.sample | 14 +++++++-------
client/tests/kvm/tests_base.cfg.sample | 26 ++++++++++++++++++++++++--
3 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/client/tests/kvm/get_started.py b/client/tests/kvm/get_started.py
index 6fa6b5f..353cfbe 100755
--- a/client/tests/kvm/get_started.py
+++ b/client/tests/kvm/get_started.py
@@ -82,11 +82,11 @@ if __name__ == "__main__":
logging.info("3 - Verifying iso (make sure we have the OS ISO needed for "
"the default test set)")
- iso_name = "Fedora-13-x86_64-DVD.iso"
- fedora_dir = "pub/fedora/linux/releases/13/Fedora/x86_64/iso"
+ iso_name = "Fedora-14-x86_64-DVD.iso"
+ fedora_dir = "pub/fedora/linux/releases/14/Fedora/x86_64/iso"
url = os.path.join("http://download.fedoraproject.org/";, fedora_dir,
iso_name)
- hash = "65c7f1aad3feb888ae3daadaf45d4a2a32b8773a"
+ hash = "381d7336c6d1685cbb4eae49cdef2247"
destination = os.path.join(base_dir, 'isos', 'linux')
check_iso(url, destination, hash)
diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index ce3e307..a564510 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -43,8 +43,8 @@ variants:
# Subtest choice. You can modify that line to add more subtests
only unattended_install.cdrom boot shutdown
- # Runs qemu, f13 64 bit guest OS, install, boot, shutdown
- - @qemu_f13_quick:
+ # Runs qemu, f14 64 bit guest OS, install, boot, shutdown
+ - @qemu_f14_quick:
# We want qemu for this run
qemu_binary = /usr/bin/qemu
only qcow2
@@ -55,13 +55,13 @@ variants:
only up
only no_pci_assignable
only smallpages
- only Fedora.13.64
+ only Fedora.14.64
only unattended_install.cdrom boot shutdown
# qemu needs -enable-kvm on the cmdline
extra_params += ' -enable-kvm'
- # Runs qemu-kvm, f13 64 bit guest OS, install, boot, shutdown
- - @qemu_kvm_f13_quick:
+ # Runs qemu-kvm, f14 64 bit guest OS, install, boot, shutdown
+ - @qemu_kvm_f14_quick:
# We want qemu-kvm for this run
qemu_binary = /usr/bin/qemu-kvm
only qcow2
@@ -70,7 +70,7 @@ variants:
only smp2
only no_pci_assignable
only smallpages
- only Fedora.13.64
+ only Fedora.14.64
only unattended_install.cdrom boot shutdown
# You may provide information about the DTM server for WHQL tests here:
@@ -87,4 +87,4 @@ variants:
#kill_unresponsive_vms.* ?= no
# Choose your test list from the testsets defined
-only qemu_kvm_f13_quick
+only qemu_kvm_f14_quick
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index f783f6b..2ae7f78 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -930,6 +930,28 @@ variants:
#floppy = images/f13-64/ks.vfd
cdrom_unattended = images/f13-64/ks.iso
+ - 14.32:
+ image_name = f14-32
+ cdrom_cd1 = linux/Fedora-14-i386-DVD.iso
+ md5sum = 1cc67641506d2f931d669b8d3528dded
+ md5sum_1m = d314ab126dabab686111e6a0d71d2e67
+ unattended_install.cdrom:
+ unattended_file = unattended/Fedora-14.ks
+ tftp = images/f14-32/tftpboot
+ #floppy = images/f14-32/ks.vfd
+ cdrom_unattended = images/f14-32/ks.iso
+
+ - 14.64:
+ image_name = f14-64
+ cdrom_cd1 = linux/Fedora-14-x86_64-DVD.iso
+ md5sum = f2ebf941dc45f99ee3e8a457c9544552
+ md5sum_1m = df029f9cffbc3517937a91124a1e0c3a
+ unattended_install.cdrom:
+ unattended_file = unattended/Fedora-14.ks
+ tftp = images/f14-64/tftpboot
+ #floppy = images/f14-64/ks.vfd
+ cdrom_unattended = images/f14-64/ks.iso
+
- DSL-4.2.5:
no setup dbench bonnie linux_s3
@@ -1957,8 +1979,8 @@ variants:
virtio_net|virtio_blk|e1000|balloon_check:
- only Fedora.11 Fedora.12 Fedora.13 RHEL.5 RHEL.6 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
- # only WinXP Win2003 Win2008 WinVista Win7 Fedora.11 Fedora.12 Fedora.13 RHEL.5 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
+ only Fedora.11 Fedora.12 Fedora.13 Fedora.14 RHEL.5 RHEL.6 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
+ # only WinXP Win2003 Win2008 WinVista Win7 Fedora.11 Fedora.12 Fedora.13 Fedora.14 RHEL.5 RHEL.6 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
kdump:
only RHEL.5 RHEL.6
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
