ubuntu-server-iso-testing

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

  1. vmlinuz_rename_for_amd64
  2. Merge into trunk
Proposed by Para Siva
Status: Merged
Merged at revision: 265
Proposed branch: lp:~psivaa/ubuntu-server-iso-testing/vmlinuz_rename_for_amd64
Merge into: lp:ubuntu-server-iso-testing
Diff against target: 31 lines (+5/-2)
1 file modified
run-test.py (+5/-2)
To merge this branch: bzr merge lp:~psivaa/ubuntu-server-iso-testing/vmlinuz_rename_for_amd64
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Para Siva (community) Abstain
Review via email: mp+138249@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

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 updated
263. By Para Siva

Fix for the vmlinuz renaming with corrections

Revision history for this message
Para Siva (psivaa) wrote :

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
Revision history for this message
Para Siva (psivaa) :
review: Abstain
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Looks good, approved. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-test.py'
2--- run-test.py 2012-08-28 09:18:12 +0000
3+++ run-test.py 2012-12-06 18:11:22 +0000
4@@ -40,7 +40,8 @@
5
6 logging.basicConfig(level=logging.DEBUG)
7
8-def set_config(variant = 'server'):
9+
10+def set_config(variant='server', arch='i386'):
11 """ Set parameters specific to a variant """
12 global DEFAULT_TMPL_DIR, DEFAULT_TEST_TIMEOUT, DISK_SIZE, COMPRESS_CMD,\
13 UNCOMPRESS_CMD, KERNEL_DIR, INITRD, KERNEL, PRESEED
14@@ -54,6 +55,8 @@
15 UNCOMPRESS_CMD = "lzcat -S lz "
16 KERNEL_DIR = "casper"
17 INITRD = "initrd.lz"
18+ if arch == 'amd64':
19+ KERNEL = "vmlinuz.efi"
20 elif variant in ('alternate', 'netboot'):
21 DEFAULT_TMPL_DIR = "/usr/share/ubuntu-iso-testing/templates.alternate"
22 DEFAULT_TEST_TIMEOUT = 3600
23@@ -179,7 +182,7 @@
24 logging.info('Sleeping for %d seconds (LP: #961217)', START_DELAY)
25 time.sleep(START_DELAY)
26
27-set_config(options.variant)
28+set_config(options.variant, options.arch)
29 # Get all environment variable for general test configuration
30 global TMPL_DIR
31 if options.test_dir:

Subscribers

People subscribed via source and target branches