Merge lp:~liuyq0307/lava-dispatcher/sdcard-mount into lp:lava-dispatcher

[Yongqin Liu]

update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0

[Andy Doan (doanac)]

review: Approve

[Antonio Terceiro (terceiro)]

Yongqin Liu escreveu:
> Yongqin Liu has proposed merging lp:~liuyq0307/lava-dispatcher/sdcard-mount into lp:lava-dispatcher.
>
> Requested reviews:
> Linaro Validation Team (linaro-validation)
>
> For more details, see:
> https://code.launchpad.net/~liuyq0307/lava-dispatcher/sdcard-mount/+merge/129693
>
> update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0
> --
> https://code.launchpad.net/~liuyq0307/lava-dispatcher/sdcard-mount/+merge/129693
> Your team Linaro Validation Team is requested to review the proposed merge of lp:~liuyq0307/lava-dispatcher/sdcard-mount into lp:lava-dispatcher.

> === modified file 'lava_dispatcher/config.py'
> --- lava_dispatcher/config.py 2012-10-02 20:54:32 +0000
> +++ lava_dispatcher/config.py 2012-10-15 15:27:29 +0000
> @@ -65,6 +65,7 @@
> tester_hostname = schema.StringOption(default="linaro")
> tester_str = schema.StringOption()
> val = schema.StringOption()
> + sdcard_mountpoint_path = schema.StringOption(default="/storage/sdcard0")
>
> simulator_binary = schema.StringOption()
> license_server = schema.StringOption()
>

shouldn't the default value be what was previously hardcoded (i.e.
/mnt/sdcard) for backwards compatibility?

--
Antonio Terceiro
Software Engineer - Linaro
http://www.linaro.org

[Yongqin Liu (liuyq0307)]

> > === modified file 'lava_dispatcher/config.py'
> > --- lava_dispatcher/config.py 2012-10-02 20:54:32 +0000
> > +++ lava_dispatcher/config.py 2012-10-15 15:27:29 +0000
> > @@ -65,6 +65,7 @@
> > tester_hostname = schema.StringOption(default="linaro")
> > tester_str = schema.StringOption()
> > val = schema.StringOption()
> > + sdcard_mountpoint_path =
> schema.StringOption(default="/storage/sdcard0")
> >
> > simulator_binary = schema.StringOption()
> > license_server = schema.StringOption()
> >
>
> shouldn't the default value be what was previously hardcoded (i.e.
> /mnt/sdcard) for backwards compatibility?
Now all the pandaboard builds have changed to use the new mountpoint,
And most of the case in the future, we will use the new version builds
so I'd like to defined mount point in conf file when necessary like using previous build.

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2012-10-02 20:54:32 +0000
+++ lava_dispatcher/config.py	2012-10-15 15:27:29 +0000
@@ -65,6 +65,7 @@
     tester_hostname = schema.StringOption(default="linaro")
     tester_str = schema.StringOption()
     val = schema.StringOption()
+    sdcard_mountpoint_path = schema.StringOption(default="/storage/sdcard0")
 
     simulator_binary = schema.StringOption()
     license_server = schema.StringOption()

=== modified file 'lava_dispatcher/device/master.py'
--- lava_dispatcher/device/master.py	2012-10-09 02:05:17 +0000
+++ lava_dispatcher/device/master.py	2012-10-15 15:27:29 +0000
@@ -610,10 +610,12 @@
         # If there is no userdata partition on the sdcard(like iMX and Origen),
         # then the sdcard partition will be used as the userdata partition as
         # before, and so cannot be used here as the sdcard on android
-        original = 'dev_mount sdcard /mnt/sdcard %s ' % (
+        original = 'dev_mount sdcard %s %s ' % (
+            target.config.sdcard_mountpoint_path,
             target.config.sdcard_part_android_org)
-        replacement = 'dev_mount sdcard /mnt/sdcard %s ' % (
-            target.sdcard_part_lava)
+        replacement = 'dev_mount sdcard %s %s ' % (
+            target.config.sdcard_mountpoint_path,
+            target.config.sdcard_part_android)
         sed_cmd = "s@{original}@{replacement}@".format(original=original,
                                                        replacement=replacement)
         session.run(