Merge lp:~nuclearbob/utah/iso-static-validation-updates into lp:utah

[Max Brustkern]

I've modified the tests to work correctly on raring desktop and server images, and verified they still work correctly on precise desktop and server images.

[Joe Talbott (joetalbott)]

This looks good to me.

I wonder how often we'll need to make thise sort of updates and whether we should consider adding a config file to indicate exclude/include files based on release.

Maybe something along the lines of:

[raring]
-wubi.exe
-autorun.cnf
+cdromupgrade

Just a thought. Take is with a {grain,pinch} of salt.

review: Approve

[Max Brustkern (nuclearbob)]

We shouldn't have to make these updates more often that every six months, but I think a more robust system for managing changes across releases would be a good idea in the future.

=== modified file 'utah/iso.py'
--- utah/iso.py	2012-11-14 18:28:18 +0000
+++ utah/iso.py	2012-11-16 19:32:44 +0000
@@ -108,7 +108,8 @@
             installtype = 'mini'
         elif 'casper' in files or './casper' in files:
             installtype = 'desktop'
-        elif './preseed/ubuntu-server.seed' in files:
+        elif ('preseed/ubuntu-server.seed' in files or
+              './preseed/ubuntu-server.seed' in files):
             installtype = 'server'
         self.logger.info('Image type is: ' + installtype)
         return installtype
 
=== modified file 'utah/isotest/data/file_list_di'
--- utah/isotest/data/file_list_di	2012-06-14 14:45:56 +0000
+++ utah/isotest/data/file_list_di	2012-11-16 19:32:44 +0000
@@ -1,15 +1,15 @@
-./boot
-./cdromupgrade
-./.disk
-./dists
-./doc
-./install
-./install/initrd.gz
-./install/mt86plus
-./install/netboot
-./install/netboot/pxelinux.0
-./install/netboot/pxelinux.cfg
-./install/netboot/ubuntu-installer
+boot
+cdromupgrade
+.disk
+dists
+doc
+install
+install/initrd.gz
+install/mt86plus
+install/netboot
+install/netboot/pxelinux.0
+install/netboot/pxelinux.cfg
+install/netboot/ubuntu-installer
 boot-screens
 boot-screens/adtxt.cfg
 boot-screens/exithelp.cfg
@@ -36,14 +36,14 @@
 pxelinux.0
 pxelinux.cfg
 pxelinux.cfg/default
-./install/netboot/version.info
-./install/README.sbm
-./install/sbm.bin
-./install/vmlinu
-./isolinux
-./md5sum.txt
-./pics
-./pool
-./preseed
-./README.diskdefines
-./ubuntu
+install/netboot/version.info
+install/README.sbm
+install/sbm.bin
+install/vmlinu
+isolinux
+md5sum.txt
+pics
+pool
+preseed
+README.diskdefines
+ubuntu
 
=== modified file 'utah/isotest/data/file_list_ubiquity'
--- utah/isotest/data/file_list_ubiquity	2012-06-14 14:45:56 +0000
+++ utah/isotest/data/file_list_ubiquity	2012-11-16 19:32:44 +0000
@@ -1,21 +1,21 @@
-./autorun.inf
-./boot
-./casper
-./.disk
-./dists
-./install
-./isolinux
-./md5sum.txt
-./pics
-./pool
-./preseed
-./README.diskdefines
-./ubuntu
-./wubi.exe
-/casper
-/casper/filesystem.squashfs
-/casper/vmlinuz
-/casper/initrd.lz
-/casper/filesystem.manifest
-/casper/filesystem.manifest-remove
-/casper/filesystem.size
+autorun.inf
+boot
+casper
+.disk
+dists
+install
+isolinux
+md5sum.txt
+pics
+pool
+preseed
+README.diskdefines
+ubuntu
+wubi.exe
+casper
+casper/filesystem.squashfs
+casper/vmlinuz
+casper/initrd.lz
+casper/filesystem.manifest
+casper/filesystem.manifest-remove
+casper/filesystem.size
 
=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2012-11-15 16:09:28 +0000
+++ utah/isotest/iso_static_validation.py	2012-11-16 19:32:44 +0000
@@ -20,6 +20,8 @@
 # <http://www.gnu.org/licenses/>.
 #
 
+# TODO: support for non-daily images
+
 import os
 import argparse
 import sys
@@ -64,6 +66,7 @@
             iso_location = path
             break
     iso = ISO(image=iso_location)
+    st_release = iso.series
     st_variant = iso.installtype
     st_arch = iso.arch
 
@@ -245,7 +248,9 @@
 
     # Test if  wubi is present for desktop or dvd and it is a valid PE
     @unittest.skipUnless(st_variant == 'desktop' and
-                         st_arch != 'powerpc', "Skipping non ubiquity images")
+                         st_arch != 'powerpc' and st_release < 'raring', 
+                         "Skipping images that aren't ubiquity-based and "
+                         "older than raring")
     def test_wubi(self):
         logging.debug('Extracting wubi from the desktop images')
         (stdout, stderr) = self.iso.extract('./wubi.exe', self.temp_dir)
@@ -270,9 +275,18 @@
         logging.debug('Check for error in extracting file list from the iso')
         self.assertEqual(stderr, '')
         files_list = open(os.path.join(DATA_PATH, 'file_list_ubiquity'))
+        exclude_files = []
+        if self.st_release >= 'r':
+            # wubi is not shipped in raring
+            exclude_files.append('autorun.inf')
+            exclude_files.append('wubi.exe')
         for list_server in files_list:
             logging.debug('Check if relevant files are present in the iso')
-            self.assertIn(list_server.rstrip(), stdout)
+            path = list_server.rstrip()
+            if path in exclude_files:
+                logging.debug(path + ' excluded based on release')
+            else:
+                self.assertIn(path, stdout)
 
     # Test if the relevant important files are present in the iso for dvd iso
     @unittest.skipUnless(st_variant == 'dvd',
@@ -302,9 +316,18 @@
         else:  # i386 or amd64
             files_list = open(os.path.join(DATA_PATH, 'file_list_di'))
 
+        exclude_files = []
+        if self.st_release >= 'q':
+            # cdromupgrade is not shipped in quantal
+            exclude_files.append('cdromupgrade')
+            
         for list_server in files_list:
             logging.debug('check if important d-i files are present in iso')
-            self.assertIn(list_server.rstrip(), stdout)
+            path = list_server.rstrip()
+            if path in exclude_files:
+                logging.debug(path + ' excluded based on release')
+            else:
+                self.assertIn(path, stdout)
 
     # Test if vmlinuz is a valid executable
     @unittest.skipUnless(ubiquity_image and st_arch != 'powerpc',