Merge lp:~liuyq0307/lava-dispatcher/problems-deploy-android into lp:lava-dispatcher

[Yongqin Liu]

Fix some problems for deploying android image
1. update the source that modify vold.fstab for mounting sdcard
2. the typo for calling hard_reboot method
3. problem when run boot_linaro_android_image without the boot_linaro_android_image action
4. add the rc= to the PS1 of the master image(when the master image is rebooted by pressing the power button or rebooted by hardreset, there will be no rc= in the the PS1 prompt)

[Andy Doan (doanac)]

1) I don't understand that part. It almost looks like its making a change that won't work with old Android builds? Does "/storage/sdcard0" need to become a config value or something?

2) +1

3) Can you explain how you make this happen. The only way I see this being possible is if your job file doesn't include a deploy action? If this is to make unit testing easier, just set target.deployment_data in your python shell or test script

4) Good catch. But why not just always set this rather than waiting for the prompt and timing out. I'd also drop the
 self.proc.sendline('echo "check rc in PS1"')
You'll see that in the job file anyway.

[Yongqin Liu (liuyq0307)]

> 1) I don't understand that part. It almost looks like its making a change that
> won't work with old Android builds? Does "/storage/sdcard0" need to become a
> config value or something?
Good Idea
> 2) +1
>
> 3) Can you explain how you make this happen. The only way I see this being
> possible is if your job file doesn't include a deploy action? If this is to
> make unit testing easier, just set target.deployment_data in your python shell
> or test script
Usually, I use the following job to boot to the deployed android and do the following test,
this will same me the time to deploy the android:
$ cat /var/www/images/workspace/jobs/reboot.json
{
  "job_name": "reboot",
  "image_type": "android",
  "target": "panda01",
  "timeout": 18000,
  "actions": [
    {
      "command": "boot_linaro_android_image"
    }
  ]
}
$
> 4) Good catch. But why not just always set this rather than waiting for the
> prompt and timing out. I'd also drop the
> self.proc.sendline('echo "check rc in PS1"')
> You'll see that in the job file anyway.
If we don't check, we may get the PS1 like "$PS1 $PS1 [rc=$(echo \$?)]: $PS1 [rc=$(echo \$?)]:".

And about the check, we can use sendline(""), but I'd like to make it more explicitly.

[lp:~liuyq0307/lava-dispatcher/problems-deploy-android]

400. By Yongqin Liu on 2012-10-12

use config for the sdcard mount point path

[Michael Hudson-Doyle (mwhudson)]

Yongqin Liu <email address hidden> writes:

>> 3) Can you explain how you make this happen. The only way I see this being
>> possible is if your job file doesn't include a deploy action? If this is to
>> make unit testing easier, just set target.deployment_data in your python shell
>> or test script
> Usually, I use the following job to boot to the deployed android and do the following test,
> this will same me the time to deploy the android:
> $ cat /var/www/images/workspace/jobs/reboot.json
> {
> "job_name": "reboot",
> "image_type": "android",
> "target": "panda01",
> "timeout": 18000,
> "actions": [
> {
> "command": "boot_linaro_android_image"
> }
> ]
> }

I think we'll need to change this a bit -- maybe create actions like
"assume_android_deployed" and "assume_ubuntu_deployed" that set the
deployment_data appropriately but do not do anything else?

> $
>> 4) Good catch. But why not just always set this rather than waiting for the
>> prompt and timing out. I'd also drop the
>> self.proc.sendline('echo "check rc in PS1"')
>> You'll see that in the job file anyway.
> If we don't check, we may get the PS1 like "$PS1 $PS1 [rc=$(echo
> \$?)]: $PS1 [rc=$(echo \$?)]:".
> And about the check, we can use sendline(""), but I'd like to make it more explicitly.

I'm completely changing how prompts are handled in my prompt-sanity
branch. I hope this part of your branch is no longer needed.

Cheers,
mwh

[Yongqin Liu (liuyq0307)]

split the sdcard mount and typo of _hard_reboot out to
https://code.launchpad.net/~liuyq0307/lava-dispatcher/sdcard-mount/+merge/129693
and
https://code.launchpad.net/~liuyq0307/lava-dispatcher/typo-hard-reboot/+merge/129694

please review there

Unmerged revisions

400. By Yongqin Liu on 2012-10-12

use config for the sdcard mount point path

399. By Yongqin Liu on 2012-10-11

fix some problems when delopy android image

=== modified file 'lava_dispatcher/client/targetdevice.py'
--- lava_dispatcher/client/targetdevice.py	2012-09-30 17:01:36 +0000
+++ lava_dispatcher/client/targetdevice.py	2012-10-12 02:55:21 +0000
@@ -30,6 +30,7 @@
     )
 from lava_dispatcher.device.target import (
     get_target,
+    Target,
     )
 from lava_dispatcher.utils import (
     logging_system,
@@ -65,6 +66,9 @@
             self.target_device.deploy_linaro_prebuilt(image)
 
     def _boot_linaro_image(self):
+        # because this method may be called from _boot_linaro_android_image
+        if not self.target_device.deployment_data:
+            self.target_device.deployment_data = Target.ubuntu_deployment_data
         self.proc = self.target_device.power_on()
 
     def _boot_linaro_android_image(self):
@@ -75,6 +79,8 @@
             logging.info("waiting for TIME_WAIT 5555 socket to finish")
             time.sleep(3)
 
+        self.target_device.deployment_data = Target.android_deployment_data
+
         self._boot_linaro_image()
 
     def reliable_session(self):

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2012-10-02 20:54:32 +0000
+++ lava_dispatcher/config.py	2012-10-12 02:55:21 +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-12 02:55:21 +0000
@@ -373,6 +373,12 @@
         """
         try:
             self._in_master_shell()
+            self.proc.sendline('echo "check rc in PS1"')
+            match_id = self.proc.expect(["\[rc=", pexpect.TIMEOUT],
+                                        timeout=3, lava_no_logging=1)
+            if match_id != 0:
+                self.proc.sendline('export PS1="$PS1 [rc=$(echo \$?)]: "')
+
             yield MasterCommandRunner(self)
         except OperationFailed:
             self.boot_master_image()
@@ -427,7 +433,7 @@
             self._enter_uboot()
         except:
             logging.exception("_enter_uboot failed")
-            self.hard_reboot()
+            self._hard_reboot()
             self._enter_uboot()
         self.proc.sendline(boot_cmds[0])
         for line in range(1, len(boot_cmds)):
@@ -610,10 +616,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(