Merge lp://qastaging/~doanac/lava-dispatcher/uefi-from-prak into lp://qastaging/lava-dispatcher

Proposed by Andy Doan
Status: Rejected
Rejected by: Neil Williams
Proposed branch: lp://qastaging/~doanac/lava-dispatcher/uefi-from-prak
Merge into: lp://qastaging/lava-dispatcher
Diff against target: 366 lines (+199/-4)
10 files modified
lava_dispatcher/actions/boot_control.py (+22/-0)
lava_dispatcher/actions/deploy.py (+14/-0)
lava_dispatcher/client/base.py (+14/-0)
lava_dispatcher/client/targetdevice.py (+9/-0)
lava_dispatcher/config.py (+1/-0)
lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf (+5/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf (+5/-0)
lava_dispatcher/device/fastmodel.py (+8/-0)
lava_dispatcher/device/master.py (+118/-4)
lava_dispatcher/device/target.py (+3/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/lava-dispatcher/uefi-from-prak
Reviewer Review Type Date Requested Status
Linaro Validation Team Pending
Review via email: mp+137243@code.qastaging.launchpad.net

Description of the change

These are the changes from Prakash for UEFI booting in Origen. I've made them into a proper branch so we can discuss the changes.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :
Download full text (7.9 KiB)

Hey Guys,

I turned this into a proper merge proposal on LP so we have a way to
discuss the changes. My comments are below, basically - I'm pretty sure
we can dramatically simplify this to be a very small change (my guess
<15 lines of code).

On 11/30/2012 09:54 AM, Andy Doan wrote:
> === modified file 'lava_dispatcher/actions/boot_control.py'
> --- lava_dispatcher/actions/boot_control.py 2012-11-20 21:22:17 +0000
> +++ lava_dispatcher/actions/boot_control.py 2012-11-30 15:53:29 +0000
> @@ -70,6 +70,28 @@
> finally:
> self.context.test_data.add_result("boot_image", status)
>
> +### UEFI
> +
> +class cmd_boot_linaro_uefi_image(BaseAction):
> + """ Call client code to boot to the master image
> + """
> +
> + parameters_schema = _boot_schema
> +
> + def run(self,options=[]):
> + client = self.client
> + client.target_device.boot_options = options
> + status = 'pass'
> + try:
> + client.boot_linaro_uefi_image()
> + except:
> + logging.exception("boot_linaro_image failed")
> + status = 'fail'
> + raise CriticalError("Failed to boot uefi test image.")
> + finally:
> + self.context.test_data.add_result("boot_uefi_image",status)
> +
> +### UEFI

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/actions/deploy.py'
> --- lava_dispatcher/actions/deploy.py 2012-11-20 13:34:19 +0000
> +++ lava_dispatcher/actions/deploy.py 2012-11-30 15:53:29 +0000
> @@ -91,6 +91,20 @@
> def run(self, boot, system, data, rootfstype='ext4'):
> self.client.deploy_linaro_android(boot, system, data, rootfstype)
>
> +## UEFI ##
> +class cmd_deploy_linaro_uefi_image(BaseAction):
> + parameters_schema = {
> + 'type': 'object',
> + 'properties' : {
> + 'hwpack': {'type':'string','optional': True},
> + 'rootfs' : {'type':'string','optional': True},
> + },
> + 'additionalProperties': False,
> + }
> +
> + def run(self, hwpack, rootfs):
> + self.client.deploy_linaro_uefi(hwpack,rootfs)
> +## UEFI ##

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/client/base.py'
> --- lava_dispatcher/client/base.py 2012-11-29 08:54:47 +0000
> +++ lava_dispatcher/client/base.py 2012-11-30 15:53:29 +0000
> @@ -402,6 +402,20 @@
> self.setup_proxy(TESTER_PS1_PATTERN)
> logging.info("System is in test image now")
>
> +### UEFI
> + def boot_linaro_uefi_image(self):
> + """
> + Reboot the system to the uefi test image
> + """
> + logging.info("Boot the uefi test image")
> +
> + self._boot_linaro_uefi_image()
> +
> + wait_for_prompt(self.proc,'/bin/sh', timeout=300)
> + logging.info("System is in test image now")
> +
> +### UEFI
> +

I don't think this is needed. See my comments for the deploy logic in
master.py below.

> === modified file 'lava_dispatcher/client/targetdevice.py'
> --- lava_dispatcher/client/targetdevice.py 2012-11-21 22:07:45 +0000
> +++ lava_dis...

Read more...

Unmerged revisions

474. By Andy Doan

uefi support changes from prakash

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches