Also, make it the default for virt tests.
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
client/tests/kvm/guest-os.cfg.sample | 27 +++++++++++++++++++++++
client/tests/kvm/tests.cfg.sample | 10 ++++----
client/virt/unattended/Fedora-16.ks | 39 ++++++++++++++++++++++++++++++++++
client/virt/virt_utils.py | 6 ++--
4 files changed, 74 insertions(+), 8 deletions(-)
create mode 100644 client/virt/unattended/Fedora-16.ks
diff --git a/client/tests/kvm/guest-os.cfg.sample
b/client/tests/kvm/guest-os.cfg.sample
index 1e19c52..cd9427e 100644
--- a/client/tests/kvm/guest-os.cfg.sample
+++ b/client/tests/kvm/guest-os.cfg.sample
@@ -328,6 +328,33 @@ variants:
md5sum_cd1 = c122a2a4f478da4a3d2d12396e84244e
md5sum_1m_cd1 = c02f37e293bbc85be02a7c850a61273a
+ - 16.32:
+ image_name = f16-32
+ unattended_install:
+ unattended_file = unattended/Fedora-16.ks
+ #floppy = images/f16-32/ks.vfd
+ cdrom_unattended = images/f16-32/ks.iso
+ kernel = images/f16-32/vmlinuz
+ initrd = images/f16-32/initrd.img
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/Fedora-16-i386-DVD.iso
+ md5sum_cd1 = 0d64ab6b1b800827a9c83d95395b3da0
+ md5sum_1m_cd1 = 3f616b5034980cadeefe67dbca79cf99
+
+ - 16.64:
+ image_name = f16-64
+ unattended_install:
+ unattended_file = unattended/Fedora-16.ks
+ #floppy = images/f16-64/ks.vfd
+ cdrom_unattended = images/f16-64/ks.iso
+ kernel = images/f16-64/vmlinuz
+ initrd = images/f16-64/initrd.img
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/Fedora-16-x86_64-DVD.iso
+ md5sum_cd1 = bb38ea1fe4b2fc69e7a6e15cf1c69c91
+ md5sum_1m_cd1 = e25ea147176f24239d38a46f501bd25e
+
+
- RHEL:
no setup
shell_prompt = "^\[.*\][\#\$]\s*$"
diff --git a/client/tests/kvm/tests.cfg.sample
b/client/tests/kvm/tests.cfg.sample
index a30158b..4b217ee 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -78,7 +78,7 @@ variants:
only unattended_install.cdrom, boot, shutdown
# Runs qemu, f15 64 bit guest OS, install, boot, shutdown
- - @qemu_f15_quick:
+ - @qemu_f16_quick:
# We want qemu for this run
qemu_binary = /usr/bin/qemu
qemu_img_binary = /usr/bin/qemu-img
@@ -90,13 +90,13 @@ variants:
only up
only no_pci_assignable
only smallpages
- only Fedora.15.64
+ only Fedora.16.64
only unattended_install.cdrom, boot, shutdown
# qemu needs -enable-kvm on the cmdline
extra_params += ' -enable-kvm'
# Runs qemu-kvm, f15 64 bit guest OS, install, boot, shutdown
- - @qemu_kvm_f15_quick:
+ - @qemu_kvm_f16_quick:
# We want qemu-kvm for this run
qemu_binary = /usr/bin/qemu-kvm
qemu_img_binary = /usr/bin/qemu-img
@@ -106,7 +106,7 @@ variants:
only smp2
only no_pci_assignable
only smallpages
- only Fedora.15.64
+ only Fedora.16.64
only unattended_install.cdrom, boot, shutdown
# Runs your own guest image (qcow2, can be adjusted), all migration tests
@@ -140,4 +140,4 @@ variants:
#kill_unresponsive_vms.* ?= no
# Choose your test list from the testsets defined
-only qemu_kvm_f15_quick
+only qemu_kvm_f16_quick
diff --git a/client/virt/unattended/Fedora-16.ks
b/client/virt/unattended/Fedora-16.ks
new file mode 100644
index 0000000..eb52c1f
--- /dev/null
+++ b/client/virt/unattended/Fedora-16.ks
@@ -0,0 +1,39 @@
+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
+%end
+
+%post --interpreter /usr/bin/python
+import socket, os
+os.system('grubby --remove-args="rhgb quiet" --update-kernel=$(grubby
--default-kernel)')
+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
diff --git a/client/virt/virt_utils.py b/client/virt/virt_utils.py
index ba76979..f3fbd14 100644
--- a/client/virt/virt_utils.py
+++ b/client/virt/virt_utils.py
@@ -3493,11 +3493,11 @@ def virt_test_assistant(test_name, test_dir, base_dir,
default_userspace_paths,
logging.info("%s - Verifying iso (make sure we have the OS ISO needed for "
"the default test set)", step)
- iso_name = "Fedora-15-x86_64-DVD.iso"
- fedora_dir = "pub/fedora/linux/releases/15/Fedora/x86_64/iso"
+ iso_name = "Fedora-16-x86_64-DVD.iso"
+ fedora_dir = "pub/fedora/linux/releases/16/Fedora/x86_64/iso"
url = os.path.join("http://download.fedoraproject.org/";, fedora_dir,
iso_name)
- hash = "61b3407f62bac22d3a3b2e919c7fc960116012d7"
+ hash = "76dd59c37e9a0ec2af56263fa892ff571c92c89a"
destination = os.path.join(base_dir, 'isos', 'linux')
check_iso(url, destination, hash)
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
