Update tests_base.cfg, tests.cfg and get_started.py.
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 | 25 ++++++++++++++++++
client/tests/kvm/unattended/Fedora-15.ks | 40 ++++++++++++++++++++++++++++++
4 files changed, 75 insertions(+), 10 deletions(-)
create mode 100644 client/tests/kvm/unattended/Fedora-15.ks
diff --git a/client/tests/kvm/get_started.py b/client/tests/kvm/get_started.py
index 5f76817..cf6e3a9 100755
--- a/client/tests/kvm/get_started.py
+++ b/client/tests/kvm/get_started.py
@@ -100,11 +100,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-14-x86_64-DVD.iso"
- fedora_dir = "pub/fedora/linux/releases/14/Fedora/x86_64/iso"
+ iso_name = "Fedora-15-x86_64-DVD.iso"
+ fedora_dir = "pub/fedora/linux/releases/15/Fedora/x86_64/iso"
url = os.path.join("http://download.fedoraproject.org/";, fedora_dir,
iso_name)
- hash = "38a4078011bac74493db7ecc53c9d9fbc96dbbd5"
+ hash = "61b3407f62bac22d3a3b2e919c7fc960116012d7"
destination = os.path.join(base_dir, 'isos', 'linux')
path = os.path.join(destination, iso_name)
check_iso(url, destination, hash)
diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index 02a7002..ef48a90 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -50,8 +50,8 @@ variants:
# Subtest choice. You can modify that line to add more subtests
only unattended_install.cdrom, boot, shutdown
- # Runs qemu, f14 64 bit guest OS, install, boot, shutdown
- - @qemu_f14_quick:
+ # Runs qemu, f15 64 bit guest OS, install, boot, shutdown
+ - @qemu_f15_quick:
# We want qemu for this run
qemu_binary = /usr/bin/qemu
qemu_img_binary = /usr/bin/qemu-img
@@ -63,13 +63,13 @@ variants:
only up
only no_pci_assignable
only smallpages
- only Fedora.14.64
+ only Fedora.15.64
only unattended_install.cdrom, boot, shutdown
# qemu needs -enable-kvm on the cmdline
extra_params += ' -enable-kvm'
- # Runs qemu-kvm, f14 64 bit guest OS, install, boot, shutdown
- - @qemu_kvm_f14_quick:
+ # Runs qemu-kvm, f15 64 bit guest OS, install, boot, shutdown
+ - @qemu_kvm_f15_quick:
# We want qemu-kvm for this run
qemu_binary = /usr/bin/qemu-kvm
qemu_img_binary = /usr/bin/qemu-img
@@ -79,7 +79,7 @@ variants:
only smp2
only no_pci_assignable
only smallpages
- only Fedora.14.64
+ only Fedora.15.64
only unattended_install.cdrom, boot, shutdown
# You may provide information about the DTM server for WHQL tests here:
@@ -96,4 +96,4 @@ variants:
#kill_unresponsive_vms.* ?= no
# Choose your test list from the testsets defined
-only qemu_kvm_f14_quick
+only qemu_kvm_f15_quick
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 81faa7d..59805ee 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1421,6 +1421,31 @@ variants:
md5sum_cd1 = f2ebf941dc45f99ee3e8a457c9544552
md5sum_1m_cd1 = df029f9cffbc3517937a91124a1e0c3a
+ - 15.32:
+ image_name = f15-32
+ unattended_install:
+ unattended_file = unattended/Fedora-15.ks
+ #floppy = images/f15-32/ks.vfd
+ cdrom_unattended = images/f15-32/ks.iso
+ kernel = images/f15-32/vmlinuz
+ initrd = images/f15-32/initrd.img
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/Fedora-15-i386-DVD.iso
+ md5sum_cd1 = 9a91492ac84dde9ceff0cb346a079487
+ md5sum_1m_cd1 = 82a6005e8b7740628c6e53eef92f6bc1
+
+ - 15.64:
+ image_name = f15-64
+ unattended_install:
+ unattended_file = unattended/Fedora-15.ks
+ #floppy = images/f15-64/ks.vfd
+ cdrom_unattended = images/f15-64/ks.iso
+ kernel = images/f15-64/vmlinuz
+ initrd = images/f15-64/initrd.img
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/Fedora-15-x86_64-DVD.iso
+ md5sum_cd1 = c122a2a4f478da4a3d2d12396e84244e
+ md5sum_1m_cd1 = c02f37e293bbc85be02a7c850a61273a
- DSL-4.2.5:
diff --git a/client/tests/kvm/unattended/Fedora-15.ks b/client/tests/kvm/unattended/Fedora-15.ks
new file mode 100644
index 0000000..ea15d80
--- /dev/null
+++ b/client/tests/kvm/unattended/Fedora-15.ks
@@ -0,0 +1,40 @@
+install
+KVM_TEST_MEDIUM
+text
+reboot
+lang en_US
+keyboard us
+network --bootproto dhcp
+rootpw 123456
+firewall --enabled --ssh
+selinux --enforcing
+timezone --utc America/New_York
+firstboot --disable
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
+zerombr
+poweroff
+
+clearpart --all --initlabel
+autopart
+
+%packages
+@base
+@development-libs
+@development-tools
+ntpdate
+dmidecode
+%end
+
+%post --interpreter /usr/bin/python
+import socket, os
+os.system('dhclient')
+os.system('chkconfig sshd on')
+os.system('iptables -F')
+os.system('echo 0 > /selinux/enforce')
+server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+server.bind(('', 12323))
+server.listen(1)
+(client, addr) = server.accept()
+client.send("done")
+client.close()
+%end
--
1.7.5.4
--
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
