* [PATCH 1/5] KVM test: Fix incorrect CdromDisk instantiation when distro is OpenSUSE
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
@ 2011-04-18 22:40 ` Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 2/5] KVM test: Unattended install Give Linux VMs time to shutdown cleanly v2 Lucas Meneghel Rodrigues
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-18 22:40 UTC (permalink / raw)
To: autotest; +Cc: kvm
We need to pass an additional tmpdir param to the class initialization.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests/unattended_install.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py
index c7e19da..2d58cf2 100644
--- a/client/tests/kvm/tests/unattended_install.py
+++ b/client/tests/kvm/tests/unattended_install.py
@@ -376,7 +376,7 @@ class UnattendedInstallConfig(object):
# SUSE autoyast install
dest_fname = "autoinst.xml"
if self.cdrom_unattended:
- boot_disk = CdromDisk(self.cdrom_unattended)
+ boot_disk = CdromDisk(self.cdrom_unattended, self.tmpdir)
elif self.floppy:
boot_disk = FloppyDisk(self.floppy, self.qemu_img_binary,
self.tmpdir)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/5] KVM test: Unattended install Give Linux VMs time to shutdown cleanly v2
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 1/5] KVM test: Fix incorrect CdromDisk instantiation when distro is OpenSUSE Lucas Meneghel Rodrigues
@ 2011-04-18 22:40 ` Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 3/5] KVM test: unattended_install: Introduce wait_no_ack param Lucas Meneghel Rodrigues
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-18 22:40 UTC (permalink / raw)
To: autotest; +Cc: kvm
During unattended install, right after we receive the ACK from the guest
the test is deemed to be finished, and as shutdown_vm = yes, it'll try
to end the vm issuing a shutdown command to it. However, on virtually
all Linux guests an SSH server is not available at the end of install,
so KVM autotest will end the VM forcefully, which is not really safe,
although it has served us well so far.
We did not fix this 'problem' so far because on RHEL3, a supported
guest, the anaconda syntax does not support the 'poweroff' directive,
only 'reboot', so if we don't finish the VM right after the ACK from
guest we really can't prevent it from starting the install again,
getting an infinite loop.
Well then, let's restrict this behavior only to RHEL 3, and fix this
properly for all other systems, by introducing a 'shutdown_cleanly'
param and setting it to 'yes' to everybody but RHEL 3. Windows doesn't
need this at all, as when the ACK is received the system is fully booted
up and functional, so the postprocessing will take care of shutting down
the VM cleanly.
I've fixed all Fedora and RHEL unattended files as part of this change.
With this change, we can get rid of another parameter, post_install_delay,
that was created with the only purpose of handling the fact that on
autoyast install, when the ACK is sent to host, the system is not fully
done with install. So we end up fixing yet another problem :)
Changes from v1:
* Properly convert the post ack timeout to an int
* Don't fix SLES unattended files, they'll be fixed in posterior patches
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests/unattended_install.py | 10 ++++++----
client/tests/kvm/tests_base.cfg.sample | 8 ++++++--
client/tests/kvm/unattended/Fedora-10.ks | 1 +
client/tests/kvm/unattended/Fedora-11.ks | 1 +
client/tests/kvm/unattended/Fedora-12.ks | 1 +
client/tests/kvm/unattended/Fedora-13.ks | 1 +
client/tests/kvm/unattended/Fedora-14.ks | 1 +
client/tests/kvm/unattended/Fedora-9.ks | 1 +
client/tests/kvm/unattended/RHEL-4-series.ks | 2 +-
client/tests/kvm/unattended/RHEL-5-series.ks | 2 +-
client/tests/kvm/unattended/RHEL-6-series.ks | 2 +-
11 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py
index 2d58cf2..fe7222e 100644
--- a/client/tests/kvm/tests/unattended_install.py
+++ b/client/tests/kvm/tests/unattended_install.py
@@ -558,7 +558,9 @@ def run_unattended_install(test, params, env):
logging.info("Guest reported successful installation after %d s (%d min)",
time_elapsed, time_elapsed/60)
- if post_install_delay:
- logging.debug("Post install delay specified, waiting %s s...",
- post_install_delay)
- time.sleep(post_install_delay)
+ if params.get("shutdown_cleanly", "yes") == "yes":
+ shutdown_cleanly_timeout = int(params.get("shutdown_cleanly_timeout",
+ 120))
+ logging.info("Wait for guest to shudown cleanly...")
+ if kvm_utils.wait_for(vm.is_dead, shutdown_cleanly_timeout, 1, 1):
+ logging.info("Guest managed to shutdown cleanly")
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 6397590..b96755d 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -101,6 +101,8 @@ variants:
kill_vm = yes
kill_vm_gracefully = yes
kill_vm_on_error = yes
+ shutdown_cleanly = yes
+ shutdown_cleanly_timeout = 120
force_create_image = yes
extra_params += " -boot d"
guest_port_unattended_install = 12323
@@ -1294,7 +1296,6 @@ variants:
# hold your autoyast file
extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
#extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
- post_install_delay = 10
variants:
- 11.0.32:
@@ -1434,7 +1435,6 @@ variants:
# hold your autoyast file
extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
#extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
- post_install_delay = 10
kernel = linux
initrd = initrd
@@ -1563,6 +1563,8 @@ variants:
cdrom_unattended = images/rhel39-32/ks.iso
kernel = images/rhel39-32/vmlinuz
initrd = images/rhel39-32/initrd.img
+ # 3.X anaconda does not support 'poweroff' on ks
+ shutdown_cleanly = no
unattended_install.cdrom:
cdrom_cd1 = isos/linux/RHEL-3.9-i386-DVD.iso
md5sum_cd1 = ddd11a1cb104119039b0fa05df6d52b8
@@ -1583,6 +1585,8 @@ variants:
cdrom_unattended = images/rhel39-64/ks.iso
kernel = images/rhel39-64/vmlinuz
initrd = images/rhel39-64/initrd.img
+ # 3.X anaconda does not support 'poweroff' on ks
+ shutdown_cleanly = no
unattended_install.cdrom:
cdrom_cd1 = isos/linux/RHEL-3.9-x86_64-DVD.iso
md5sum_cd1 = bf4635e4a4bd3b43838e72bc8c329d55
diff --git a/client/tests/kvm/unattended/Fedora-10.ks b/client/tests/kvm/unattended/Fedora-10.ks
index 5dffccd..081d41a 100644
--- a/client/tests/kvm/unattended/Fedora-10.ks
+++ b/client/tests/kvm/unattended/Fedora-10.ks
@@ -16,6 +16,7 @@ zerombr
clearpart --all --initlabel
autopart
reboot
+poweroff
%packages
@base
diff --git a/client/tests/kvm/unattended/Fedora-11.ks b/client/tests/kvm/unattended/Fedora-11.ks
index c7d43b3..c339220 100644
--- a/client/tests/kvm/unattended/Fedora-11.ks
+++ b/client/tests/kvm/unattended/Fedora-11.ks
@@ -12,6 +12,7 @@ timezone --utc America/New_York
firstboot --disable
bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
+poweroff
clearpart --all --initlabel
autopart
diff --git a/client/tests/kvm/unattended/Fedora-12.ks b/client/tests/kvm/unattended/Fedora-12.ks
index c7d43b3..c339220 100644
--- a/client/tests/kvm/unattended/Fedora-12.ks
+++ b/client/tests/kvm/unattended/Fedora-12.ks
@@ -12,6 +12,7 @@ timezone --utc America/New_York
firstboot --disable
bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
+poweroff
clearpart --all --initlabel
autopart
diff --git a/client/tests/kvm/unattended/Fedora-13.ks b/client/tests/kvm/unattended/Fedora-13.ks
index c7d43b3..c339220 100644
--- a/client/tests/kvm/unattended/Fedora-13.ks
+++ b/client/tests/kvm/unattended/Fedora-13.ks
@@ -12,6 +12,7 @@ timezone --utc America/New_York
firstboot --disable
bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
+poweroff
clearpart --all --initlabel
autopart
diff --git a/client/tests/kvm/unattended/Fedora-14.ks b/client/tests/kvm/unattended/Fedora-14.ks
index db4298b..816428e 100644
--- a/client/tests/kvm/unattended/Fedora-14.ks
+++ b/client/tests/kvm/unattended/Fedora-14.ks
@@ -12,6 +12,7 @@ timezone --utc America/New_York
firstboot --disable
bootloader --location=mbr --append="rd_NO_PLYMOUTH console=tty0 console=ttyS0,115200"
zerombr
+poweroff
clearpart --all --initlabel
autopart
diff --git a/client/tests/kvm/unattended/Fedora-9.ks b/client/tests/kvm/unattended/Fedora-9.ks
index 9403191..a7d5399 100644
--- a/client/tests/kvm/unattended/Fedora-9.ks
+++ b/client/tests/kvm/unattended/Fedora-9.ks
@@ -16,6 +16,7 @@ zerombr
clearpart --all --initlabel
autopart
reboot
+poweroff
%packages
@base
diff --git a/client/tests/kvm/unattended/RHEL-4-series.ks b/client/tests/kvm/unattended/RHEL-4-series.ks
index 4583c76..2f7853e 100644
--- a/client/tests/kvm/unattended/RHEL-4-series.ks
+++ b/client/tests/kvm/unattended/RHEL-4-series.ks
@@ -15,7 +15,7 @@ bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
clearpart --all --initlabel
autopart
-reboot
+poweroff
%packages
@ base
diff --git a/client/tests/kvm/unattended/RHEL-5-series.ks b/client/tests/kvm/unattended/RHEL-5-series.ks
index c528d8a..a7be569 100644
--- a/client/tests/kvm/unattended/RHEL-5-series.ks
+++ b/client/tests/kvm/unattended/RHEL-5-series.ks
@@ -15,7 +15,7 @@ bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
clearpart --all --initlabel
autopart
-reboot
+poweroff
%packages
@base
diff --git a/client/tests/kvm/unattended/RHEL-6-series.ks b/client/tests/kvm/unattended/RHEL-6-series.ks
index 04f0672..fc41057 100644
--- a/client/tests/kvm/unattended/RHEL-6-series.ks
+++ b/client/tests/kvm/unattended/RHEL-6-series.ks
@@ -15,7 +15,7 @@ bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
clearpart --all --initlabel
autopart
-reboot
+poweroff
%packages
@base
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] KVM test: unattended_install: Introduce wait_no_ack param
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 1/5] KVM test: Fix incorrect CdromDisk instantiation when distro is OpenSUSE Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 2/5] KVM test: Unattended install Give Linux VMs time to shutdown cleanly v2 Lucas Meneghel Rodrigues
@ 2011-04-18 22:40 ` Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 4/5] KVM test: Make OpenSUSE and SLES to use unattended_cdrom Lucas Meneghel Rodrigues
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-18 22:40 UTC (permalink / raw)
To: autotest; +Cc: kvm
Some distros such as OpenSUSE won't let the install test to
communicate the guest ACK for some weird reason [1], this commit
modifies the unattended_install test introducing a wait_no_ack
param that will skip the ACK check, and break the unattended
install loop when the machine turns off itself (directive halt
on OpenSUSE and SLES unattended file).
Other distros shouldn't be affected by this change, their
install behavior was kept the same.
[1] Tried several ways of transmitting the ACK by means of chroot
scripts, no way. In the end of the day, I was short on time to
spend too much of it figuring out a way to do it, hence the
wait_no_ack param was born. I really could use some help from the
guys that introduced OpenSUSE and SLES support to kvm autotest.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests/unattended_install.py | 25 +++++++++++++++++--------
client/tests/kvm/tests_base.cfg.sample | 2 ++
client/tests/kvm/unattended/OpenSUSE-11.xml | 13 ++-----------
client/tests/kvm/unattended/SLES-11.xml | 13 ++-----------
4 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py
index fe7222e..8513e0b 100644
--- a/client/tests/kvm/tests/unattended_install.py
+++ b/client/tests/kvm/tests/unattended_install.py
@@ -526,15 +526,23 @@ def run_unattended_install(test, params, env):
start_time = time.time()
while (time.time() - start_time) < install_timeout:
- vm.verify_alive()
- vm.verify_kernel_crash()
- client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
- client.connect((vm.get_address(), port))
- if client.recv(1024) == "done":
+ vm.verify_alive()
+ except kvm_vm.VMDeadError, e:
+ if params.get("wait_no_ack", "no") == "yes":
break
- except (socket.error, kvm_vm.VMAddressError):
- pass
+ else:
+ raise e
+ vm.verify_kernel_crash()
+ if params.get("wait_no_ack", "no") == "no":
+ client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ client.connect((vm.get_address(), port))
+ if client.recv(1024) == "done":
+ break
+ except (socket.error, kvm_vm.VMAddressError):
+ pass
+
if migrate_background:
# Drop the params which may break the migration
# Better method is to use dnsmasq to do the
@@ -549,7 +557,8 @@ def run_unattended_install(test, params, env):
vm.migrate(timeout=mig_timeout, protocol=mig_protocol)
else:
time.sleep(1)
- client.close()
+ if params.get("wait_no_ack", "no") == "no":
+ client.close()
else:
raise error.TestFail("Timeout elapsed while waiting for install to "
"finish")
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index b96755d..fbe416e 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1296,6 +1296,7 @@ variants:
# hold your autoyast file
extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
#extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
+ wait_no_ack = yes
variants:
- 11.0.32:
@@ -1437,6 +1438,7 @@ variants:
#extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
kernel = linux
initrd = initrd
+ wait_no_ack = yes
variants:
- 11.0.32:
diff --git a/client/tests/kvm/unattended/OpenSUSE-11.xml b/client/tests/kvm/unattended/OpenSUSE-11.xml
index 0ade836..0f11ac9 100644
--- a/client/tests/kvm/unattended/OpenSUSE-11.xml
+++ b/client/tests/kvm/unattended/OpenSUSE-11.xml
@@ -65,6 +65,7 @@
<ask-list config:type="list"/>
<mode>
<confirm config:type="boolean">false</confirm>
+ <halt config:type="boolean">true</halt>
</mode>
<mouse>
<id>none</id>
@@ -160,17 +161,7 @@
<source><![CDATA[dhclient eth0
chkconfig sshd on
sed -i -e 's/\(PasswordAuthentication\s\)no/\1yes/g' /etc/ssh/sshd_config
-cat <<EOF>server
-#!/usr/bin/python
-import socket, os
-server=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-server.bind(('',12323))
-server.listen(1)
-(client, addr) = server.accept()
-client.send("done")
-client.close()
-EOF
-python server
+service sshd restart
]]></source>
</script>
</init-scripts>
diff --git a/client/tests/kvm/unattended/SLES-11.xml b/client/tests/kvm/unattended/SLES-11.xml
index c694a31..16c25d0 100644
--- a/client/tests/kvm/unattended/SLES-11.xml
+++ b/client/tests/kvm/unattended/SLES-11.xml
@@ -92,6 +92,7 @@
<ask-list config:type="list"/>
<mode>
<confirm config:type="boolean">false</confirm>
+ <halt config:type="boolean">true</halt>
</mode>
<mouse>
<id>none</id>
@@ -542,17 +543,7 @@
<source><![CDATA[dhclient eth0
chkconfig sshd on
sed -i -e 's/\(PasswordAuthentication\s\)no/\1yes/g' /etc/ssh/sshd_config
-cat <<EOF>server
-#!/usr/bin/python
-import socket, os
-server=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-server.bind(('',12323))
-server.listen(1)
-(client, addr) = server.accept()
-client.send("done")
-client.close()
-EOF
-python server
+service sshd restart
]]></source>
</script>
</init-scripts>
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] KVM test: Make OpenSUSE and SLES to use unattended_cdrom
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
` (2 preceding siblings ...)
2011-04-18 22:40 ` [PATCH 3/5] KVM test: unattended_install: Introduce wait_no_ack param Lucas Meneghel Rodrigues
@ 2011-04-18 22:40 ` Lucas Meneghel Rodrigues
2011-04-18 22:40 ` [PATCH 5/5] KVM test: Introduce OpenSUSE 11.4 guest definitions Lucas Meneghel Rodrigues
2011-04-20 1:03 ` [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs pradeep
5 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-18 22:40 UTC (permalink / raw)
To: autotest; +Cc: kvm
We had disabled unattended_cdrom usage with SLES and
OpenSUSE due to the fact that autoyast=cdrom wasn't
working properly to specify a profile.
However, the interaction of the linux floppy driver with
qemu-kvm and qemu tends to generate some pretty bad guest
kernel panics, reason why we came up with unattended_cdrom
for Fedora and RHEL in the first place. Thinkering a bit
more with autoyast documentation, I've discovered that
specifying autoyast=device://scd0/autoinst.xml works fine
and so I've changed the default for both distros to use
the CD again. Now, people will have a much smoother experience
installing those distros under KVM autotest.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests_base.cfg.sample | 56 ++++++++++++++++----------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index fbe416e..5bee383 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1294,8 +1294,8 @@ variants:
unattended_install:
# You have to use autoyast=floppy if you want to use floppies to
# hold your autoyast file
- extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
- #extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
+ #extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
+ extra_params += " --append 'autoyast=device://scd0/autoinst.xml console=ttyS0,115200 console=tty0'"
wait_no_ack = yes
variants:
@@ -1308,8 +1308,8 @@ variants:
md5sum_1m_cd1 = c720b30557af758e69de450409516369
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-0-32/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-0-32/autoyast.iso
+ #floppy = images/opensuse-11-0-32/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-0-32/autoyast.iso
kernel = images/opensuse-11-0-32/linux
initrd = images/opensuse-11-0-32/initrd
boot_path = boot/i386/loader
@@ -1323,8 +1323,8 @@ variants:
image_name = openSUSE-11.0-64
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-0-64/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
+ #floppy = images/opensuse-11-0-64/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
kernel = images/opensuse-11-0-64/linux
initrd = images/opensuse-11-0-64/initrd
boot_path = boot/x86_64/loader
@@ -1342,8 +1342,8 @@ variants:
md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-1-32/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
+ #floppy = images/opensuse-11-1-32/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
kernel = images/opensuse-11-1-32/linux
initrd = images/opensuse-11-1-32/initrd
boot_path = boot/i386/loader
@@ -1361,8 +1361,8 @@ variants:
md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-1-64/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
+ #floppy = images/opensuse-11-1-64/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
kernel = images/opensuse-11-1-64/linux
initrd = images/opensuse-11-1-64/initrd
boot_path = boot/x86_64/loader
@@ -1376,8 +1376,8 @@ variants:
image_name = openSUSE-11.2-32
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-2-32/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
+ #floppy = images/opensuse-11-2-32/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
kernel = images/opensuse-11-2-32/linux
initrd = images/opensuse-11-2-32/initrd
boot_path = boot/i386/loader
@@ -1391,8 +1391,8 @@ variants:
image_name = openSUSE-11.2-64
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse11-2-64/autoyast.vfd
- #cdrom_unattended = images/opensuse11-2-64/autoyast.iso
+ #floppy = images/opensuse11-2-64/autoyast.vfd
+ cdrom_unattended = images/opensuse11-2-64/autoyast.iso
kernel = images/opensuse-11-2-64/linux
initrd = images/opensuse-11-2-64/initrd
boot_path = boot/x86_64/loader
@@ -1405,8 +1405,8 @@ variants:
image_name = openSUSE-11.3-32
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-3-32/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
+ #floppy = images/opensuse-11-3-32/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
kernel = images/opensuse-11-3-32/linux
initrd = images/opensuse-11-3-32/initrd
boot_path = boot/i386/loader
@@ -1419,8 +1419,8 @@ variants:
image_name = openSUSE-11.3-64
unattended_install:
unattended_file = unattended/OpenSUSE-11.xml
- floppy = images/opensuse-11-3-64/autoyast.vfd
- #cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
+ #floppy = images/opensuse-11-3-64/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
kernel = images/opensuse-11-3-64/linux
initrd = images/opensuse-11-3-64/initrd
boot_path = boot/x86_64/loader
@@ -1434,8 +1434,8 @@ variants:
unattended_install:
# You have to use autoyast=floppy if you want to use floppies to
# hold your autoyast file
- extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
- #extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
+ #extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
+ extra_params += " --append 'autoyast=device://scd0/autoinst.xml console=ttyS0,115200 console=tty0'"
kernel = linux
initrd = initrd
wait_no_ack = yes
@@ -1445,8 +1445,8 @@ variants:
image_name = sles11-32
unattended_install:
unattended_file = unattended/SLES-11.xml
- floppy = images/sles-11-0-32/autoyast.vfd
- #cdrom_unattended = images/sles-11-0-32/autoyast.iso
+ #floppy = images/sles-11-0-32/autoyast.vfd
+ cdrom_unattended = images/sles-11-0-32/autoyast.iso
kernel = images/sles-11-0-32/linux
initrd = images/sles-11-0-32/initrd
boot_path = boot/i386/loader
@@ -1463,8 +1463,8 @@ variants:
md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054
unattended_install:
unattended_file = unattended/SLES-11.xml
- floppy = images/sles-11-0-64/autoyast.vfd
- #cdrom_unattended = images/sles-11-0-64/autoyast.iso
+ #floppy = images/sles-11-0-64/autoyast.vfd
+ cdrom_unattended = images/sles-11-0-64/autoyast.iso
kernel = images/sles-11-0-64/linux
initrd = images/sles-11-0-64/initrd
boot_path = boot/x86_64/loader
@@ -1478,8 +1478,8 @@ variants:
image_name = sles11sp1-32
unattended_install:
unattended_file = unattended/SLES-11.xml
- floppy = images/sles-11-1-32/autoyast.vfd
- #cdrom_unattended = images/sles-11-1-32/autoyast.iso
+ #floppy = images/sles-11-1-32/autoyast.vfd
+ cdrom_unattended = images/sles-11-1-32/autoyast.iso
kernel = images/sles-11-1-32/linux
initrd = images/sles-11-1-32/initrd
boot_path = boot/i386/loader
@@ -1492,8 +1492,8 @@ variants:
image_name = sles11sp1-64
unattended_install:
unattended_file = unattended/SLES-11.xml
- floppy = images/sles-11-1-64/autoyast.vfd
- #cdrom_unattended = images/sles-11-1-64/autoyast.iso
+ #floppy = images/sles-11-1-64/autoyast.vfd
+ cdrom_unattended = images/sles-11-1-64/autoyast.iso
kernel = images/sles-11-1-64/linux
initrd = images/sles-11-1-64/initrd
boot_path = boot/x86_64/loader
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] KVM test: Introduce OpenSUSE 11.4 guest definitions
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
` (3 preceding siblings ...)
2011-04-18 22:40 ` [PATCH 4/5] KVM test: Make OpenSUSE and SLES to use unattended_cdrom Lucas Meneghel Rodrigues
@ 2011-04-18 22:40 ` Lucas Meneghel Rodrigues
2011-04-20 1:03 ` [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs pradeep
5 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-18 22:40 UTC (permalink / raw)
To: autotest; +Cc: kvm
For both 32 and 64 bit.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests_base.cfg.sample | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 5bee383..5d274f8 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1429,6 +1429,33 @@ variants:
md5sum_cd1 = adf5d2a0a03c1e3aaf102fd6a4771b87
md5sum_1m_cd1 = e0dd12dac30d296417256775e1234c6e
+ - 11.4.32:
+ image_name = openSUSE-11.4-32
+ unattended_install:
+ unattended_file = unattended/OpenSUSE-11.xml
+ #floppy = images/opensuse-11-4-32/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-4-32/autoyast.iso
+ kernel = images/opensuse-11-4-32/linux
+ initrd = images/opensuse-11-4-32/initrd
+ boot_path = boot/x86_64/loader
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/openSUSE-11.4-DVD-i586.iso
+ md5sum_cd1 = 5f6d6d67c3e256b2513311f4ed650515
+
+ - 11.4.64:
+ image_name = openSUSE-11.4-64
+ unattended_install:
+ unattended_file = unattended/OpenSUSE-11.xml
+ #floppy = images/opensuse-11-4-64/autoyast.vfd
+ cdrom_unattended = images/opensuse-11-4-64/autoyast.iso
+ kernel = images/opensuse-11-4-64/linux
+ initrd = images/opensuse-11-4-64/initrd
+ boot_path = boot/x86_64/loader
+ unattended_install.cdrom:
+ cdrom_cd1 = isos/linux/openSUSE-11.4-DVD-x86_64.iso
+ md5sum_cd1 = 082ebfac494b41cd56b38fb4218c545d
+ md5sum_1m_cd1 = 2adcc5623e6c50b5d08acb7f84aa3fb1
+
- SLES:
shell_prompt = "^root@.*[\#\$]\s*$|#"
unattended_install:
--
1.7.4.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs
2011-04-18 22:40 [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs Lucas Meneghel Rodrigues
` (4 preceding siblings ...)
2011-04-18 22:40 ` [PATCH 5/5] KVM test: Introduce OpenSUSE 11.4 guest definitions Lucas Meneghel Rodrigues
@ 2011-04-20 1:03 ` pradeep
2011-04-20 1:11 ` Lucas Meneghel Rodrigues
5 siblings, 1 reply; 8+ messages in thread
From: pradeep @ 2011-04-20 1:03 UTC (permalink / raw)
To: Lucas Meneghel Rodrigues; +Cc: autotest, kvm
On Mon, 18 Apr 2011 19:40:40 -0300
Lucas Meneghel Rodrigues <lmr@redhat.com> wrote:
> While working on making unattended install on Linux guests safer,
> noticed that the recent patches changing unattended install to use
> -kernel and -initrd options [1] were breaking OpenSUSE and SLES
> installation. As a maintainer it is my duty to fix such breakages, so
> I did it. I tested all changes with OpenSUSE 11.4, which I downloaded
> from the opensuse website.
>
> I ask the IBM guys that contributed this guest support to go through
> and test the changes, I need some help here. Anyway, I am confident
> that this patchset will bring a major improvement for the users of
> those guests.
Hello Lucas,
Now SLES guest install works fine. Thanks for fixing it.
--pradeep
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs
2011-04-20 1:03 ` [PATCH 0/5] Make unattended install on Linux safer, fix OpenSUSE/SLES installs pradeep
@ 2011-04-20 1:11 ` Lucas Meneghel Rodrigues
0 siblings, 0 replies; 8+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-04-20 1:11 UTC (permalink / raw)
To: pradeep; +Cc: autotest, kvm
On Wed, 2011-04-20 at 06:33 +0530, pradeep wrote:
> On Mon, 18 Apr 2011 19:40:40 -0300
> Lucas Meneghel Rodrigues <lmr@redhat.com> wrote:
>
> > While working on making unattended install on Linux guests safer,
> > noticed that the recent patches changing unattended install to use
> > -kernel and -initrd options [1] were breaking OpenSUSE and SLES
> > installation. As a maintainer it is my duty to fix such breakages, so
> > I did it. I tested all changes with OpenSUSE 11.4, which I downloaded
> > from the opensuse website.
> >
> > I ask the IBM guys that contributed this guest support to go through
> > and test the changes, I need some help here. Anyway, I am confident
> > that this patchset will bring a major improvement for the users of
> > those guests.
>
> Hello Lucas,
>
> Now SLES guest install works fine. Thanks for fixing it.
Good to know. Hey, when such breakages happen, you guys should yell out
loud so I can fix the problems, OK?
Cheers,
Lucas
^ permalink raw reply [flat|nested] 8+ messages in thread