Merge lp://staging/~qzhang/lava-dispatcher/add-mx53-android into lp://staging/lava-dispatcher

Proposed by Spring Zhang
Status: Merged
Merged at revision: 158
Proposed branch: lp://staging/~qzhang/lava-dispatcher/add-mx53-android
Merge into: lp://staging/lava-dispatcher
Diff against target: 240 lines (+83/-11)
5 files modified
lava_dispatcher/actions/android_deploy.py (+19/-5)
lava_dispatcher/actions/lava-android-test.py (+2/-0)
lava_dispatcher/client.py (+17/-6)
lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf (+26/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/mx53loco.conf (+19/-0)
To merge this branch: bzr merge lp://staging/~qzhang/lava-dispatcher/add-mx53-android
Reviewer Review Type Date Requested Status
Yongqin Liu Approve
Spring Zhang (community) Needs Resubmitting
Paul Larson (community) Needs Fixing
Review via email: mp+81961@code.staging.launchpad.net

Description of the change

Add basic support for imx53 android. It works basically. Still have issues to fix:
# 889030, 889023, 873232

To post a comment you must log in.
Revision history for this message
Spring Zhang (qzhang) wrote :

Yongqin,
Could you have a try on panda for I added some config to config file, I don't know if it will break.
Thank you!

156. By Spring Zhang

Wait for network up in Android part

157. By Spring Zhang

Extend wait_network_up usage for test image use

158. By Spring Zhang

merge with mainline

Revision history for this message
Spring Zhang (qzhang) wrote :

retested with normal image and mx53 android image by boot test image action after fix bug 889030 and merge with mainline

review: Needs Resubmitting
Revision history for this message
Paul Larson (pwlars) wrote :

25 + # Original android sdcard layout
26 + part_no = client.device_option("android_org_sys_part")
27 + org_sys_part = part_no if part_no else 2
28 + part_no = client.device_option("android_org_cache_part")
29 + org_cache_part = part_no if part_no else 3
30 + part_no = client.device_option("android_org_data_part")
31 + org_data_part = part_no if part_no else 5
32 + # Sdcard layout in Lava image
33 + part_no = client.device_option("android_lava_sys_part")
34 + lava_sys_part = part_no if part_no else 5
Since we are making conf options out of the partitions, it might be best to have these configed as defaults rather than hardcoding them in the source

170 +android_org_boot_part = 2
171 +android_org_sys_part = 3
172 +android_org_cache_part = 5
173 +android_org_data_part = 6
174 +android_org_sdcard_part = 7
175 +android_lava_sys_part = 6
176 +android_lava_sdcard_part = 7
177 +boot_cmds_android = mmc init,
While your at it, for the mx53 as well as the one in default, these should have comments and/or better names. These are confusing to me. For instance, what's the difference between android_org_sys_part and android_lava_sys_part?

51 + client.run_cmd_master('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" init.rc'
52 + % (org_sys_part, lava_sys_part))
ah, I see, it looks like the android_org_* is what you are changing it *from* in the image. I'm not sure this belongs in a config option in that case. This config is describing things that are specific to this board. However, you are talking about a string that is specific to the image and has nothing to do with the board itself right?

review: Needs Fixing
Revision history for this message
Yongqin Liu (liuyq0307) wrote :

115 + self.proc.expect(shell_str)
does this line has meaning?
if we don't check the result of this sentence here, may be we can delete this sentence.

Revision history for this message
Yongqin Liu (liuyq0307) wrote :

in file lava_dispatcher/default-config/lava-dispatcher/device-types/mx53loco.conf,

there are original definition of partition number
> boot_part = 2
> root_part = 3
these seems to be duplicate to the lines below:
170 +android_org_boot_part = 2
171 +android_org_sys_part = 3

others seems ok.

review: Approve
Revision history for this message
Yongqin Liu (liuyq0307) wrote :

> Yongqin,
> Could you have a try on panda for I added some config to config file, I don't
> know if it will break.
> Thank you!

Sorry, I just saw this today, I will try it later. And I will notify you the result after the test.

Revision history for this message
Spring Zhang (qzhang) wrote :

> > Yongqin,
> > Could you have a try on panda for I added some config to config file, I
> don't
> > know if it will break.
> > Thank you!
>
> Sorry, I just saw this today, I will try it later. And I will notify you the
> result after the test.
It's fine, still in fixing some comments from Paul, thanks.

Revision history for this message
Spring Zhang (qzhang) wrote :

Add default config to Paul's comments.

review: Needs Resubmitting
159. By Spring Zhang

Add default config items to reduce code and align variable name

Revision history for this message
Spring Zhang (qzhang) wrote :

> in file lava_dispatcher/default-config/lava-dispatcher/device-
> types/mx53loco.conf,
>
> there are original definition of partition number
> > boot_part = 2
> > root_part = 3
> these seems to be duplicate to the lines below:
> 170 +android_org_boot_part = 2
> 171 +android_org_sys_part = 3
>
> others seems ok.
I wish to separate them to avoid future confusion, and the former pairs are using to generate an image file by l-m-c.

Revision history for this message
Spring Zhang (qzhang) wrote :

> 115 + self.proc.expect(shell_str)
> does this line has meaning?
> if we don't check the result of this sentence here, may be we can delete this
> sentence.
You are pointing out a way to reduce the code, I'm considering if it is used for waiting for a shell prompt to execute next command, if we don't expect a master/test string, we can make the method available everywhere(both master and test image)

160. By Spring Zhang

delete shell prompt expected string to make code clean

Revision history for this message
Spring Zhang (qzhang) wrote :

Delete shell prompt expected string to wait_network_up available to master/test image.

review: Needs Resubmitting
161. By Spring Zhang

add more log information

Revision history for this message
Spring Zhang (qzhang) wrote :

Delete shell prompt expected string to wait_network_up available to master/test image.

review: Needs Resubmitting
Revision history for this message
Yongqin Liu (liuyq0307) wrote :

I plan to test it on panda this afternoon, begin at 16th Nov, 13:00 UTC+8
after test, if there is no problem I will approve this.

Revision history for this message
Yongqin Liu (liuyq0307) wrote :

I used staging-panda/90 for test.
and execute monkey/busybox/0xbench test on the image. There is no problem.
The link below is the result.
http://validation.linaro.org/lava-server/dashboard/streams/anonymous/lava-android-leb-panda/bundles/b6a0f5605220c2fef78ab03990eb654ffc68fcad/

review: Approve
162. By Spring Zhang

merge with mainline

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