Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: client/tests/kvm/tests_base.cfg.sample

Issue 6883246: Merge autotest upstream from @5318 ~ @5336 (Closed) Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tests/kvm/tests/vmstop.py ('k') | client/tests/kvm/unattended/Fedora-10.ks » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/tests_base.cfg.sample
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 6397590ca4b2425e6a851bc86a16fdf366e34163..810a4bdc4b81403d3ac230f71cf59ff4d2a803e5 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -2,6 +2,7 @@
#
# Define the objects we'll be using
vms = vm1
+vm_type = kvm
images = image1
cdroms = cd1
nics = nic1
@@ -101,6 +102,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
@@ -1292,9 +1295,9 @@ 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'"
- post_install_delay = 10
+ #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:
- 11.0.32:
@@ -1306,8 +1309,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
@@ -1321,8 +1324,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
@@ -1340,8 +1343,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
@@ -1359,8 +1362,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
@@ -1374,8 +1377,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
@@ -1389,8 +1392,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
@@ -1403,8 +1406,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
@@ -1417,8 +1420,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
@@ -1427,24 +1430,51 @@ 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:
# 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'"
- post_install_delay = 10
+ #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
variants:
- 11.0.32:
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
@@ -1461,8 +1491,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
@@ -1476,8 +1506,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
@@ -1490,8 +1520,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
@@ -1563,6 +1593,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 +1615,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
« no previous file with comments | « client/tests/kvm/tests/vmstop.py ('k') | client/tests/kvm/unattended/Fedora-10.ks » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698