Hi Lucas, F17 is not working on xen hypervisor without some changes. I'm going to prepare fixes for xen handling. Mirek ----- Original Message ----- > From: "Lucas Meneghel Rodrigues" <lmr@xxxxxxxxxx> > To: autotest@xxxxxxxxxxxxxxx > Cc: kvm@xxxxxxxxxxxxxxx > Sent: Wednesday, May 30, 2012 11:20:55 PM > Subject: [Autotest] [PATCH] virt: Add Fedora 17 to the list of guests > > Also, make it the default guest for KVM autotest. > > Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx> > --- > client/tests/kvm/tests.cfg.sample | 18 ++++++++--------- > client/tests/libvirt/tests.cfg.sample | 21 ++++++++++---------- > client/virt/guest-os.cfg.sample | 28 > ++++++++++++++++++++++++++ > client/virt/unattended/Fedora-17.ks | 35 > +++++++++++++++++++++++++++++++++ > client/virt/virt_utils.py | 6 +++--- > 5 files changed, 86 insertions(+), 22 deletions(-) > create mode 100644 client/virt/unattended/Fedora-17.ks > > diff --git a/client/tests/kvm/tests.cfg.sample > b/client/tests/kvm/tests.cfg.sample > index 9329a05..912232e 100644 > --- a/client/tests/kvm/tests.cfg.sample > +++ b/client/tests/kvm/tests.cfg.sample > @@ -57,8 +57,8 @@ variants: > # Subtest choice. You can modify that line to add more > subtests > only unattended_install.cdrom, boot, shutdown > > - # Runs qemu, f16 64 bit guest OS, install, boot, shutdown > - - @qemu_f16_quick: > + # Runs qemu, f17 64 bit guest OS, install, boot, shutdown > + - @qemu_f17_quick: > # We want qemu for this run > qemu_binary = /usr/bin/qemu > qemu_img_binary = /usr/bin/qemu-img > @@ -72,13 +72,13 @@ variants: > only no_9p_export > only no_pci_assignable > only smallpages > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.extra_cdrom_ks, boot, shutdown > # qemu needs -enable-kvm on the cmdline > extra_params += ' -enable-kvm' > > - # Runs qemu-kvm, f16 64 bit guest OS, install, boot, shutdown > - - @qemu_kvm_f16_quick: > + # Runs qemu-kvm, f17 64 bit guest OS, install, boot, shutdown > + - @qemu_kvm_f17_quick: > # We want qemu-kvm for this run > qemu_binary = /usr/bin/qemu-kvm > qemu_img_binary = /usr/bin/qemu-img > @@ -90,10 +90,10 @@ variants: > only no_9p_export > only no_pci_assignable > only smallpages > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.extra_cdrom_ks, boot, shutdown > > - # Runs qemu-kvm, f16 64 bit guest OS, install, starts qemu-kvm > + # Runs qemu-kvm, f17 64 bit guest OS, install, starts qemu-kvm > # with 9P support and runs 9P CI tests > - @qemu_kvm_9p_export: > qemu_binary = /usr/bin/qemu-kvm > @@ -106,7 +106,7 @@ variants: > only no_pci_assignable > only smallpages > only 9p_export > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.extra_cdrom_ks, boot, > 9p.9p_ci, shutdown > > # Runs your own guest image (qcow2, can be adjusted), all > migration tests > @@ -129,4 +129,4 @@ variants: > only migrate > > # Choose your test list from the testsets defined > -only qemu_kvm_f16_quick > +only qemu_kvm_f17_quick > diff --git a/client/tests/libvirt/tests.cfg.sample > b/client/tests/libvirt/tests.cfg.sample > index 548caf8..2b17d50 100644 > --- a/client/tests/libvirt/tests.cfg.sample > +++ b/client/tests/libvirt/tests.cfg.sample > @@ -6,8 +6,8 @@ > include tests-shared.cfg > > variants: > - # Runs virt-install, f16 64 bit guest OS, install, boot, > shutdown > - - @libvirt_f16_quick: > + # Runs virt-install, f17 64 bit guest OS, install, boot, > shutdown > + - @libvirt_f17_quick: > virt_install_binary = /usr/bin/virt-install > qemu_img_binary = /usr/bin/qemu-img > hvm_or_pv = hvm > @@ -18,11 +18,12 @@ variants: > only no_9p_export > only no_pci_assignable > only smallpages > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.extra_cdrom_ks, boot, reboot, > shutdown, remove_guest.with_disk > > - # Runs virt-install, f16 64 as a 64 bit PV guest OS, install, > boot, shutdown > - - @libvirt_xenpv_f16_quick: > + > + # Runs virt-install, f17 64 as a 64 bit PV guest OS, install, > boot, shutdown > + - @libvirt_xenpv_f17_quick: > virt_install_binary = /usr/bin/virt-install > qemu_img_binary = /usr/bin/qemu-img > hvm_or_pv = pv > @@ -34,12 +35,12 @@ variants: > only no_9p_export > only no_pci_assignable > only smallpages > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.http_ks, boot, reboot, > shutdown, remove_guest.with_disk > > - # Runs virt-install, f16 64 as a 64 bit HVM (full virt) guest > OS, > + # Runs virt-install, f17 64 as a 64 bit HVM (full virt) guest > OS, > # install, boot, shutdown > - - @libvirt_xenhvm_f16_quick: > + - @libvirt_xenhvm_f17_quick: > virt_install_binary = /usr/bin/virt-install > qemu_img_binary = /usr/bin/qemu-img > hvm_or_pv = hvm > @@ -52,7 +53,7 @@ variants: > only no_9p_export > only no_pci_assignable > only smallpages > - only Fedora.16.64 > + only Fedora.17.64 > only unattended_install.cdrom.in_cdrom_ks, boot, reboot, > shutdown, remove_guest.with_disk > > # Runs virt-install, RHEL 6.0 64 bit guest OS, install, boot, > shutdown > @@ -90,4 +91,4 @@ variants: > only unattended_install.cdrom, boot, reboot, shutdown, > remove_guest.with_disk > > # Choose your test list from the testsets defined > -only libvirt_f16_quick > +only libvirt_f17_quick > diff --git a/client/virt/guest-os.cfg.sample > b/client/virt/guest-os.cfg.sample > index c7e1418..1c92de0 100644 > --- a/client/virt/guest-os.cfg.sample > +++ b/client/virt/guest-os.cfg.sample > @@ -398,6 +398,34 @@ variants: > md5sum_1m_cd1 = > 23be25f6a04a78f6dc7cb6ad9e691988 > kernel_cmdline = > "root=live:CDLABEL=Fedora-16-ppc64 > ks=cdrom:/ks.cfg console=hvc0 serial > rd_NO_PLYMOUTH" > > + - 17.32: > + image_name = f17-32 > + unattended_install: > + unattended_file = > unattended/Fedora-17.ks > + #floppy = images/f17-32/ks.vfd > + cdrom_unattended = images/f17-32/ks.iso > + kernel = images/f17-32/vmlinuz > + initrd = images/f17-32/initrd.img > + unattended_install.cdrom: > + cdrom_cd1 = > isos/linux/Fedora-17-i386-DVD.iso > + md5sum_cd1 = > d4717e04b596e33898cc34970e79dd3d > + md5sum_1m_cd1 = > 2cf9ce6b24cc0e39ec04d75499f1eb2d > + kernel_params = "repo=cdrom:/dev/sr1 > ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" > + > + - 17.64: > + image_name = f17-64 > + unattended_install: > + unattended_file = > unattended/Fedora-17.ks > + #floppy = images/f17-64/ks.vfd > + cdrom_unattended = images/f17-64/ks.iso > + kernel = images/f17-64/vmlinuz > + initrd = images/f17-64/initrd.img > + unattended_install.cdrom: > + cdrom_cd1 = > isos/linux/Fedora-17-x86_64-DVD.iso > + md5sum_cd1 = > 26f3358a5f8973f0956093f28a0106e7 > + md5sum_1m_cd1 = > 51988b8593ad488fe5a790a183cf3d81 > + kernel_params = "repo=cdrom:/dev/sr1 > ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" > + > - RHEL: > no setup > shell_prompt = "^\[.*\][\#\$]\s*$" > diff --git a/client/virt/unattended/Fedora-17.ks > b/client/virt/unattended/Fedora-17.ks > new file mode 100644 > index 0000000..8f43b81 > --- /dev/null > +++ b/client/virt/unattended/Fedora-17.ks > @@ -0,0 +1,35 @@ > +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 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') > +os.system('echo Post set up finished > /dev/ttyS0') > +os.system('echo Post set up finished > /dev/hvc0') > +%end > diff --git a/client/virt/virt_utils.py b/client/virt/virt_utils.py > index 48a20f5..4bbfc7b 100644 > --- a/client/virt/virt_utils.py > +++ b/client/virt/virt_utils.py > @@ -4351,11 +4351,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-16-x86_64-DVD.iso" > - fedora_dir = "pub/fedora/linux/releases/16/Fedora/x86_64/iso" > + iso_name = "Fedora-17-x86_64-DVD.iso" > + fedora_dir = "pub/fedora/linux/releases/17/Fedora/x86_64/iso" > url = os.path.join("http://download.fedoraproject.org/", > fedora_dir, > iso_name) > - iso_sha1 = "76dd59c37e9a0ec2af56263fa892ff571c92c89a" > + iso_sha1 = "7a748072cc366ee3bdcd533afc70eda239c977c7" > destination = os.path.join(base_dir, 'isos', 'linux') > check_iso(url, destination, iso_sha1) > > -- > 1.7.10.2 > > _______________________________________________ > Autotest mailing list > Autotest@xxxxxxxxxxxxxxx > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest > -- 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