Merge lp:~psivaa/ubuntu-server-iso-testing/vmlinuz_rename_for_amd64 into lp:ubuntu-server-iso-testing

[Para Siva]

vmlinuz file for amd64 has been renamed to vmlinuz.efi. The fix is to check if the arch is amd64 and change the kernel name accordingly. Thanks

[Jean-Baptiste Lallement (jibel)]

Could you move this to the function set_config() where specific settings for variants are defined.
You might need to add an optional parameter to pass the architecture to this function too.

review: Needs Fixing

[lp:~psivaa/ubuntu-server-iso-testing/vmlinuz_rename_for_amd64]

263. By Para Siva on 2012-12-06

Fix for the vmlinuz renaming with corrections

[Para Siva (psivaa)]

Thanks for the comments. Makes real sense. I changed the code accordingly and tested with precise desktop and server images. Would be good if you could review this. Thanks

review: Needs Resubmitting

[Para Siva (psivaa)]

review: Abstain

[Jean-Baptiste Lallement (jibel)]

Looks good, approved. Thanks!

review: Approve

=== modified file 'run-test.py'
--- run-test.py	2012-08-28 09:18:12 +0000
+++ run-test.py	2012-12-06 18:11:22 +0000
@@ -40,7 +40,8 @@
 
 logging.basicConfig(level=logging.DEBUG)
 
-def set_config(variant = 'server'):
+
+def set_config(variant='server', arch='i386'):
     """ Set parameters specific to a variant """
     global DEFAULT_TMPL_DIR, DEFAULT_TEST_TIMEOUT, DISK_SIZE, COMPRESS_CMD,\
             UNCOMPRESS_CMD, KERNEL_DIR, INITRD, KERNEL, PRESEED
@@ -54,6 +55,8 @@
         UNCOMPRESS_CMD = "lzcat -S lz "
         KERNEL_DIR = "casper"
         INITRD = "initrd.lz"
+        if arch == 'amd64':
+            KERNEL = "vmlinuz.efi"
     elif variant in ('alternate', 'netboot'):
         DEFAULT_TMPL_DIR = "/usr/share/ubuntu-iso-testing/templates.alternate"
         DEFAULT_TEST_TIMEOUT = 3600
@@ -179,7 +182,7 @@
 logging.info('Sleeping for %d seconds (LP: #961217)', START_DELAY)
 time.sleep(START_DELAY)
 
-set_config(options.variant)
+set_config(options.variant, options.arch)
 # Get all environment variable for general test configuration
 global TMPL_DIR
 if options.test_dir: