Merge lp:~jibel/ubuntu-qa-tools/preinstalled_omap into lp:ubuntu-qa-tools

[Jean-Baptiste Lallement]

This adds support for no-default archs powerpc, amd64+mac, armel+omap and armel+omap4.
Which means that these archs need to be specified on the command line to be downloaded and by default only amd64 and i386 will be used.

[lp:~jibel/ubuntu-qa-tools/preinstalled_omap]

568. By Jean-Baptiste Lallement on 2011-04-19

removed a debugging line

[Michael Vogt (mvo)]

Looks good, I merged this into the ubuntu branch now

review: Approve

=== modified file 'dl-ubuntu-test-iso/dl-ubuntu-test-iso'
--- dl-ubuntu-test-iso/dl-ubuntu-test-iso	2011-04-01 18:46:19 +0000
+++ dl-ubuntu-test-iso/dl-ubuntu-test-iso	2011-04-19 13:54:29 +0000
@@ -1,4 +1,10 @@
 #!/usr/bin/python
+#
+# Written by Steve Beattie <[e-mail]>
+# Copyright 2010-2011 Canonical Ltd.
+# Licensed under the GNU General Public License, version 3.
+#
+
 from __future__ import with_statement # This isn't required in Python 2.6, but must be
                                       # in the beginning and thus can't be conditional
 
@@ -415,7 +421,15 @@
 
 	for count, image in enumerate(image_factory(wanted)):
 		release, flavor, variant, arch = image
-		isoname = release + '-' + variant + '-' + arch + '.iso'
+		if variant == 'preinstalled' and 'omap' in arch:
+			subflavor = flavor.name.split('-')
+			if len(subflavor) == 2:
+				subvariant = variant + "-" + subflavor[1]
+			else:
+				subvariant = variant + "-desktop"
+			isoname = release + '-' + subvariant + '-' + arch + '.img.gz'
+		else:
+			isoname = release + '-' + variant + '-' + arch + '.iso'
 		hashsuffix = "." + release + '-' + variant
 		path = computepath(wanted, flavor, release, variant)
 		if config.mirror:
@@ -523,25 +537,7 @@
     variantpaths['netbook'] = 'daily-live'
     variantpaths['moblin-remix'] = 'daily-live'
     variantpaths['mobile'] = 'daily-live'
-
-    Flavor('ubuntu', use_prefix=False)
-    Flavor('ubuntu-server', variants=['server'])
-    Flavor('kubuntu')
-    Flavor('kubuntu-kde4', releases=['hardy'], variants=['desktop', 'alternate'])
-    Flavor('edubuntu', variants=['addon', 'dvd'])
-    Flavor('xubuntu', variants=['desktop', 'alternate'])
-    Flavor('ubuntustudio', variants=['alternate'])
-    Flavor('jeos', releases=['hardy'], variants=['jeos'], archs=['i386'])
-    Flavor('gobuntu', releases=['hardy'], variants=['alternate'])
-    Flavor('mythbuntu', variants=['desktop'])
-    Flavor('ubuntu-mid', variants=['usb'], archs=['lpia'])
-    Flavor('ubuntu-netbook', variants=['netbook'], archs=['i386'])
-    Flavor('kubuntu-netbook', variants=['netbook'], archs=['i386'])
-    Flavor('kubuntu-mobile', variants=['mobile'], archs=['i386'])
-    Flavor('ubuntu-moblin-remix', variants=['moblin-remix'], archs=['i386'])
-
-    default['variants'] = variantpaths.keys()
-    default['flavors'] = flavors.keys()
+    variantpaths['preinstalled'] = 'daily-preinstalled'
 
     parser = OptionParser()
     parser.add_option('-n', '--no-act', default=False, action='store_true', dest='no_act', help='compute everything but don\'t actually download')
@@ -572,6 +568,30 @@
         parser.error("incorrect number of arguments")
     file_cfg =  read_config(config.config)
 
+    # Allows the download of non-default archs (see image_factory)
+    default['archs'].extend(config.arch)
+    default['variants'].extend(config.variant)
+
+    Flavor('ubuntu', use_prefix=False)
+    Flavor('ubuntu-server', variants=['server'])
+    Flavor('kubuntu')
+    Flavor('kubuntu-kde4', releases=['hardy'], variants=['desktop', 'alternate'])
+    Flavor('edubuntu', variants=['addon', 'dvd'])
+    Flavor('xubuntu', variants=['desktop', 'alternate'])
+    Flavor('ubuntustudio', variants=['alternate'])
+    Flavor('jeos', releases=['hardy'], variants=['jeos'], archs=['i386'])
+    Flavor('gobuntu', releases=['hardy'], variants=['alternate'])
+    Flavor('mythbuntu', variants=['desktop'])
+    Flavor('ubuntu-mid', variants=['usb'], archs=['lpia'])
+    Flavor('ubuntu-netbook', variants=['netbook', 'preinstalled'], archs=['i386', 'armel+omap', 'armel+omap4'])
+    Flavor('ubuntu-headless', variants=['preinstalled'], archs=['armel+omap', 'armel+omap4'])
+    Flavor('kubuntu-netbook', variants=['netbook'], archs=['i386'])
+    Flavor('kubuntu-mobile', variants=['mobile', 'preinstalled'], archs=['i386', 'armel+omap', 'armel+omap4'])
+    Flavor('ubuntu-moblin-remix', variants=['moblin-remix'], archs=['i386'])
+
+    default['variants'] = variantpaths.keys()
+    default['flavors'] = flavors.keys()
+
     wanted['flavors'] = merge_config(config.flavor, file_cfg, default, 'flavors')
     if len(config.exclude_flavor) > 0:
         wanted['flavors'] = filter(lambda x: x not in config.exclude_flavor, wanted['flavors'])