1> Change the SLES name form 11.32/11.64 to 11.0.32/11.0.64.  So we
can name the SLES11 SP1 (will release in June) as 11.1.32/11.1.64.
2> Delete the redundant tag "variants" in SLES section.

 Signed-off-by: Jin Bing Guo <[email protected]>

---
 client/tests/kvm/tests_base.cfg.sample |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/tests/kvm/tests_base.cfg.sample
b/client/tests/kvm/tests_base.cfg.sample
index 3a56b65..be96dc1 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -687,19 +687,7 @@ variants:
                     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"
-
-                variants:
-                    - 11.32:
+                    - 11.0.32:
                         image_name = sles11-32
                         cdrom=linux/SLES-11-DVD-i586-GM-DVD1.iso
                         md5sum = 4958d4dde2575666355c8a1c5858bab0
@@ -710,6 +698,17 @@ variants:
                             floppy = "images/sles11-32floppy.img"
                             pxe_dir = "boot/i386/loader"

+                    - 11.0.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 = "^r...@.*[\#\$]\s*$"

-- 
1.7.0.2

Attachment: 0001-Fix-the-name-and-format-in-SLES-Distro.patch
Description: Binary data

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to