[SCM] debian-live/autotesting branch, master, updated. 566402ff4c9794edb81e76c3db52da542cbf7442

[Brendan M. Sleight (none)]

The following commit has been merged in the master branch:
commit 566402ff4c9794edb81e76c3db52da542cbf7442
Author: Brendan M. Sleight <bms at brum.(none)>
Date:   Sat May 29 08:31:16 2010 +0100

    Finishing master test list installed as full.xml

diff --git a/tests-source/build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml b/tests-source/build-60alpha1-amd64-iso-lxde-desktop-daily.xml
similarity index 75%
copy from tests-source/build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml
copy to tests-source/build-60alpha1-amd64-iso-lxde-desktop-daily.xml
index 91a48ef..2906f76 100644
--- a/tests-source/build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml
+++ b/tests-source/build-60alpha1-amd64-iso-lxde-desktop-daily.xml
@@ -3,10 +3,10 @@
     <common>common-squeeze-build.xml</common>
     <qemu>qemu.xml</qemu>
     <processors>
-      <processor>processor-i386.xml</processor>
+      <processor>processor-amd64.xml</processor>
     </processors>
     <images>
-      <image>images-iso-hybrid.xml</image>
+      <image>images-iso-hybrid-cdrom-only.xml</image>
     </images>
     <packages>
       <package>packages-lxde-desktop.xml</package>
diff --git a/tests-source/build-60alpha1-powerpc-iso-all-monthly.xml b/tests-source/build-60alpha1-powerpc-iso-lxde-desktop-daily.xml
similarity index 75%
copy from tests-source/build-60alpha1-powerpc-iso-all-monthly.xml
copy to tests-source/build-60alpha1-powerpc-iso-lxde-desktop-daily.xml
index 8da80bb..902cc44 100644
--- a/tests-source/build-60alpha1-powerpc-iso-all-monthly.xml
+++ b/tests-source/build-60alpha1-powerpc-iso-lxde-desktop-daily.xml
@@ -9,8 +9,8 @@
       <image>images-iso.xml</image>
     </images>
     <packages>
-      <package>packages-all.xml</package>
+      <package>packages-lxde-desktop.xml</package>
     </packages>
-    <frequency>frequency-monthly.xml</frequency>
+    <frequency>frequency-daily.xml</frequency>
   </merge>
 </autotesting>
diff --git a/tests-source/parts/images-iso.xml b/tests-source/parts/images-iso-hybrid-cdrom-only.xml
similarity index 53%
copy from tests-source/parts/images-iso.xml
copy to tests-source/parts/images-iso-hybrid-cdrom-only.xml
index 1bc6a6b..cf6086a 100644
--- a/tests-source/parts/images-iso.xml
+++ b/tests-source/parts/images-iso-hybrid-cdrom-only.xml
@@ -2,9 +2,10 @@
   <common>
       <images>
         <image>
-          <name>iso</name>
+          <name>iso-hybrid</name>
+          <nametwo>boot-as-cdrom</nametwo>
           <extension>.iso</extension>
-          <qemu_options>-cdrom</qemu_options>
+          <qemu_options>-vga std -cdrom</qemu_options>
         </image>
       </images>
   </common>

-- 
debian-live/autotesting