From patchwork Sat Apr 17 23:31:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 93333 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3HNW4j8029201 for ; Sat, 17 Apr 2010 23:32:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755837Ab0DQXbw (ORCPT ); Sat, 17 Apr 2010 19:31:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43285 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755803Ab0DQXbu (ORCPT ); Sat, 17 Apr 2010 19:31:50 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3HNVhut022223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 17 Apr 2010 19:31:43 -0400 Received: from localhost.localdomain (vpn-11-144.rdu.redhat.com [10.11.11.144]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3HNVetu023571; Sat, 17 Apr 2010 19:31:41 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, ryanh@us.ibm.com, yogi , Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Introducing Opensuse and SLES unattended installs Date: Sat, 17 Apr 2010 20:31:37 -0300 Message-Id: <1271547097-28219-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Apr 2010 23:32:05 +0000 (UTC) diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py index 1ddb996..8411501 100644 --- a/client/tests/kvm/tests/unattended_install.py +++ b/client/tests/kvm/tests/unattended_install.py @@ -18,6 +18,7 @@ def run_unattended_install(test, params, env): port = vm.get_port(int(params.get("guest_port_unattended_install"))) addr = ('localhost', port) + post_install_delay = int(params.get("post_install_delay")) install_timeout = float(params.get("timeout", 3000)) logging.info("Starting unattended install watch process. " @@ -31,6 +32,10 @@ def run_unattended_install(test, params, env): client.connect(addr) msg = client.recv(1024) if msg == 'done': + if post_install_delay: + logging.debug("Post install delay specified, " + "waiting %ss...", post_install_delay) + time.sleep(post_install_delay) break except socket.error: pass diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 052ab60..e73ba44 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -418,7 +418,7 @@ variants: pxe_image = "vmlinuz" pxe_initrd = "initrd.img" tftp = "images/tftpboot" - extra_params += " -bootp /pxelinux.0 -boot n" + extra_params += " -bootp /pxelinux.0 -boot cn" kernel_args = "ks=floppy nicdelay=60" variants: @@ -551,32 +551,110 @@ variants: md5sum = 7e9e183dc11b9d39f480238e4e12bb05 md5sum_1m = dc7865a75db665efc86d59bca7c1fe07 - - openSUSE-11.0.32: - no setup dbench bonnie - image_name = openSUSE-11.0-32 - install: - steps = openSUSE-11.0-32.steps - cdrom = linux/openSUSE-11.0-DVD-i386.iso - md5sum = ed6a5b3feb668866df812b1c2aed9d7f - md5sum_1m = c720b30557af758e69de450409516369 - - - openSUSE-11.1.32: - no setup dbench bonnie - image_name = openSUSE-11.1-32 - install: - steps = openSUSE-11.1-32-and-64.steps - cdrom = linux/openSUSE-11.1-DVD-i586.iso - md5sum = 8f51b278c0415be28c5699e465444bd3 - md5sum_1m = b70217417468389083429f81ba7ce2bd - - - openSUSE-11.1.64: - no setup dbench bonnie - image_name = openSUSE-11.1-64 - install: - steps = openSUSE-11.1-32-and-64.steps - cdrom = linux/openSUSE-11.1-DVD-x86_64.iso - md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8 - md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0 + - OpenSUSE: + no setup + shell_prompt = ".*:.*\s#" + unattended_install: + pxe_image = "linux" + pxe_initrd = "initrd" + tftp = "images/tftpboot" + extra_params += " -bootp /pxelinux.0 -boot cn" + kernel_args = "autoyast=floppy" + post_install_delay = 10 + + variants: + - 11.0.32: + image_name = openSUSE-11.0-32 + cdrom = linux/openSUSE-11.0-DVD-i386.iso + md5sum = ed6a5b3feb668866df812b1c2aed9d7f + md5sum_1m = c720b30557af758e69de450409516369 + install: + steps = openSUSE-11.0-32.steps + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles110-32/tftpboot + floppy = images/sles110-32floppy.img + pxe_dir = boot/i386/loader + + - 11.0.64: + image_name = openSUSE-11.0-64 + cdrom = linux/openSUSE-11.0-DVD-x86_64.iso + md5sum = 512c8346b0f8eb35f28c4eb96454d391 + md5sum_1m = 661aa4cd031df2f25ea0102318a3f4d1 + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles110-64/tftpboot + floppy = images/sles110-64floppy.img + pxe_dir = boot/x86_64/loader + + - 11.1.32: + image_name = openSUSE-11.1-32 + cdrom = linux/openSUSE-11.1-DVD-i586.iso + md5sum = 8f51b278c0415be28c5699e465444bd3 + md5sum_1m = b70217417468389083429f81ba7ce2bd + install: + steps=openSUSE-11.1-32-and-64.steps + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles111-32/tftpboot + floppy = images/sles111-32floppy.img + pxe_dir = boot/i386/loader + + - 11.1.64: + image_name = openSUSE-11.1-64 + cdrom = linux/openSUSE-11.1-DVD-x86_64.iso + md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8 + md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0 + install: + steps=openSUSE-11.1-32-and-64.steps + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles111-64/tftpboot + floppy = images/sles111-64floppy.img + pxe_dir = boot/x86_64/loader + + - 11.2.32: + image_name = openSUSE-11.2-32 + cdrom = linux/openSUSE-11.2-DVD-i586.iso + md5sum = 295d713314a30ad017948f0d542c6d92 + md5sum_1m = 1f8767d00acb492be5a5627c834e543f + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles112-32/tftpboot + floppy = images/sles112-32floppy.img + pxe_dir = boot/i386/loader + + - 11.2.64: + image_name = openSUSE-11.2-64 + cdrom = linux/openSUSE-11.2-DVD-x86_64.iso + md5sum = 6a09295e34dc030319d040f67f4742c6 + md5sum_1m = 11fd11d39744450b898f04c371dde2e7 + unattended_install: + unattended_file = unattended/OpenSUSE-11.xml + tftp = images/sles112-64/tftpboot + floppy = images/sles112-64floppy.img + pxe_dir = boot/x86_64/loader + + - SLES: + shell_prompt = "^root@.*[\#\$]\s*$|#" + unattended_install: + pxe_image = "linux" + pxe_initrd = "initrd" + extra_params += " -bootp /pxelinux.0 -boot n" + kernel_args = "autoyast=floppy" + post_install_delay = 10 + + variants: + - 11.64: + image_name = sles11-64 + cdrom=linux/SLES-11-DVD-x86_64-GM-DVD1.iso + md5sum = 50a2bd45cd12c3808c3ee48208e2586b + md5sum_1m = 00000951cab7c32e332362fc424c1054 + unattended_install: + unattended_file = unattended/SLES-11.xml + tftp = "images/sles11-64/tftpboot" + floppy = "images/sles11-64floppy.img" + pxe_dir = "boot/x86_64/loader" - @Ubuntu: shell_prompt = "^root@.*[\#\$]\s*$" @@ -621,7 +699,7 @@ variants: pxe_image = "vmlinuz" pxe_initrd = "initrd.img" tftp = "images/tftpboot" - extra_params += " -bootp /pxelinux.0 -boot n" + extra_params += " -bootp /pxelinux.0 -boot cn" kernel_args = "ks=floppy nicdelay=60" variants: @@ -1197,7 +1275,7 @@ variants: virtio|virtio_blk|e1000|balloon_check: - only Fedora.11 Fedora.12 Win2008 WinVista Win7 openSUSE-11 Ubuntu-8.10-server + only Fedora.11 Fedora.12 Win2008 WinVista Win7 OpenSUSE.11 Ubuntu-8.10-server variants: diff --git a/client/tests/kvm/unattended/OpenSUSE-11.xml b/client/tests/kvm/unattended/OpenSUSE-11.xml new file mode 100644 index 0000000..7dd44fa --- /dev/null +++ b/client/tests/kvm/unattended/OpenSUSE-11.xml @@ -0,0 +1,251 @@ + + + + + + + hd0 + /dev/vda + + + + true + false + false + false + true + false + false + /boot/message + false + 2 + 8 + + + + processor + + + thermal + + + ata_piix + + + virtio_pci + + + fan + + + jbd + + + ext3 + + + virtio_blk + + + edd + + + grub + + + + + + + false + false + + + + + false + + + none + + + true + true + true + true + false + true + + + + + 33 + x + video + linux + + + 16 + x + dialout + linux + + + + + bios + tty1 tty2 tty3 tty4 tty5 tty6 + + english-us + + + + + + AUTO + + + true + true + + + + dhcp + eth0 + auto + no + + + false + + false + + + + + /dev/vda + + CT_DISK + all + + + + + true + true + 0 + + + true + true + 0 + + + true + true + 0 + + + true + true + 0 + + + + + + + + + + + + + autoyast2-installation + dhcp-client + dhcp-tools + autoyast2-installation + autoyast2-installation + autoyast2-installation + + + apparmor + apparmor_opt + base + console + devel_basis + enhanced_base + enhanced_base_opt + sw_management + yast2_basis + yast2_install_wf + + + + 100 + video,dialout + /home + -1 + /bin/bash + /etc/skel + + + + true + linux + 100 + /home/linux + + -1 + 99999 + 0 + 7 + + /bin/bash + 1000 + $2a$05$bgtKW4IJKSS04W4GdU4ckeZL9yVHZdTmZz6F.gAxw9xItSfmt.zci + linux + + + true + root + 0 + /root + + -1 + 99999 + 0 + 7 + + /bin/bash + 0 + $2a$05$yit2ieOcDslJrkEqLo8D3ej1ZNWNX79iAaT885W.aDTZ581ZwBD8S + root + + + diff --git a/client/tests/kvm/unattended/SLES-11.xml b/client/tests/kvm/unattended/SLES-11.xml new file mode 100644 index 0000000..93e5685 --- /dev/null +++ b/client/tests/kvm/unattended/SLES-11.xml @@ -0,0 +1,898 @@ + + + + + + + true + false + false + false + true + false + SUSE Linux Enterprise Server 11 - 2.6.27.19-5 + true + false + 2 + 8 + false + + + + processor + + + thermal + + + ata_piix + + + ata_generic + + + piix + + + ide_pci_generic + + + fan + + + jbd + + + ext3 + + + edd + + + grub + + + + YaST_Default_CA + YaST Default CA (linux-h1i4) + US + ENTER PASSWORD HERE + linux-h1i4.site + postmaster@site + false + + + false + + + no + no + no + sshd + + any + + no + yes + no + no + nf_conntrack_netbios_ns + no + yes + no + yes + no + no + no + false + false + + + + + false + + + none + + + + true + true + true + true + false + true + + + + + 1000 + $1$9ibtMhyS$uY16P2nxSWgejk4Ffz/LB0 + users + + + + 19 + x + floppy + + + + 1 + x + bin + daemon + + + 41 + x + xok + + + + 65533 + x + nobody + + + + 43 + x + modem + + + + 5 + x + tty + + + + 7 + x + lp + + + + 104 + ! + uuidd + + + + 51 + ! + postfix + + + + 111 + ! + gdm + + + + 65534 + x + nogroup + nobody + + + 101 + ! + messagebus + + + + 59 + ! + maildrop + + + + 33 + x + video + linux + + + 3 + x + sys + + + + 15 + x + shadow + + + + 20 + x + cdrom + + + + 21 + x + console + + + + 42 + x + trusted + + + + 102 + ! + haldaemon + + + + 16 + x + dialout + linux + + + 106 + ! + polkituser + + + + 10 + x + wheel + + + + 107 + ! + pulse + + + + 8 + x + www + + + + 40 + x + games + + + + 6 + x + disk + + + + 17 + x + audio + pulse + + + 110 + ! + suse-ncc + + + + 49 + x + ftp + + + + 25 + ! + at + + + + 9 + x + kmem + + + + 32 + x + public + + + + 12 + x + mail + + + + 0 + x + root + + + + 2 + x + daemon + + + + 103 + ! + sfcb + root + + + 105 + ! + ntp + + + + 14 + x + uucp + + + + 109 + ! + pulse-access + + + + 71 + ! + ntadmin + + + + 62 + x + man + + + + 108 + ! + pulse-rt + + + + 22 + x + utmp + + + + 13 + x + news + + + + 65 + ! + sshd + + + + + + + 127.0.0.1 + + localhost + + + + ::1 + + localhost ipv6-localhost ipv6-loopback + + + + fe00::0 + + ipv6-localnet + + + + ff00::0 + + ipv6-mcastprefix + + + + ff02::1 + + ipv6-allnodes + + + + ff02::2 + + ipv6-allrouters + + + + ff02::3 + + ipv6-allhosts + + + + + + 1.0 + + + english-us + + + en_US + en_US + + + + + false + false + dc=example,dc=com + 127.0.0.1 + true + false + true + member + + + + exop + false + false + + + + + true + auto + + + + dhcp + eth0 + auto + no + + + false + + false + + + + auto + false + false + false + false + false + + + + true + + + CT_DISK + all + + + + false + + + + localhost, 127.0.0.1 + + + + + + true + true + 10 + + + true + true + 10 + + + true + true + 10 + + + true + true + 10 + + + + 3 + + + + + + + + + dhcp-client + + + Basis-Devel + base + laptop + Minimal + + + + UTC + America/New_York + + + 100 + video,dialout + /home + -1 + /bin/bash + /etc/skel + + + + true + linux + 100 + /home/linux + + 99999 + 0 + 7 + + /bin/bash + 1000 + $2a$05$FAAcDkjOVQxuDKvppCzcROelTVQeDSr9FIKSwP02wrg7SBulFkeXK + linux + + + true + Games account + 100 + /var/games + /bin/bash + 12 + * + games + + + true + bin + 1 + /bin + /bin/bash + 1 + * + bin + + + true + nobody + 65533 + /var/lib/nobody + /bin/bash + 65534 + * + nobody + + + true + Printing daemon + 7 + /var/spool/lpd + /bin/bash + 4 + * + lp + + + true + User for uuidd + 104 + /var/run/uuidd + + 99999 + 0 + 7 + + /bin/false + 102 + * + uuidd + + + true + Postfix Daemon + 51 + /var/spool/postfix + + 99999 + 0 + 7 + + /bin/false + 51 + * + postfix + + + true + Novell Customer Center User + 110 + /var/lib/YaST2/suse-ncc-fakehome + + 99999 + 0 + 7 + + /bin/bash + 105 + * + suse-ncc + + + true + FTP account + 49 + /srv/ftp + /bin/bash + 40 + * + ftp + + + true + Gnome Display Manager daemon + 111 + /var/lib/gdm + + 99999 + 0 + 7 + + /bin/false + 106 + * + gdm + + + true + Batch jobs daemon + 25 + /var/spool/atjobs + + 99999 + 0 + 7 + + /bin/bash + 25 + * + at + + + true + root + 0 + /root + /bin/bash + 0 + $2a$05$6EDh/ymzfFidFVZ9GxPpR.QLaswYgGBxlmCoy0WUo42stJDGcPcxK + root + + + true + Mailer daemon + 12 + /var/spool/clientmqueue + /bin/false + 8 + * + mail + + + true + Daemon + 2 + /sbin + /bin/bash + 2 + * + daemon + + + true + NTP daemon + 105 + /var/lib/ntp + + 99999 + 0 + 7 + + /bin/false + 74 + * + ntp + + + true + Unix-to-Unix CoPy system + 14 + /etc/uucp + /bin/bash + 10 + * + uucp + + + true + User for D-Bus + 101 + /var/run/dbus + + 0 + 7 + + /bin/false + 100 + * + messagebus + + + true + User for haldaemon + 102 + /var/run/hald + + 0 + 7 + + /bin/false + 101 + * + haldaemon + + + true + WWW daemon apache + 8 + /var/lib/wwwrun + /bin/false + 30 + * + wwwrun + + + true + Manual pages viewer + 62 + /var/cache/man + /bin/bash + 13 + * + man + + + true + PolicyKit + 106 + /var/run/PolicyKit + + 99999 + 0 + 7 + + /bin/false + 103 + * + polkituser + + + true + News system + 13 + /etc/news + /bin/bash + 9 + * + news + + + SSH daemon + 65 + /var/lib/sshd + + + -1 + 99999 + 0 + 7 + + /bin/false + 71 + sshd + + + true + PulseAudio daemon + 107 + /var/lib/pulseaudio + + 99999 + 0 + 7 + + /sbin/nologin + 104 + * + pulse + + + + 16 + gdm + false + + + 38 + 60 + 31 + 50 + + 800X600@60HZ + --> VESA + + 800x600 (SVGA) + gnome + +