Merge lp:~pwlars/ubuntu-test-cases/krillin-recovery into lp:ubuntu-test-cases/touch

[Paul Larson]

No devices are hooked up that use this just yet, but in my testing at home, this seems to work. There should be a device to add by Thursday.

[lp:~pwlars/ubuntu-test-cases/krillin-recovery]

320. By Paul Larson on 2014-10-15

some fixups needed for suspend-blocker, but still not completely working

[Evan (ev)]

Looks good, just one question inline.

review: Approve

[lp:~pwlars/ubuntu-test-cases/krillin-recovery]

321. By Paul Larson on 2014-10-15

Use a more recent "stable" fallback image on krillin until we get a new
stable promotion.

=== modified file 'scripts/device_info.py'
--- scripts/device_info.py	2014-10-14 21:46:04 +0000
+++ scripts/device_info.py	2014-10-15 04:55:46 +0000
@@ -17,13 +17,14 @@
 
 class TouchDevice(object):
     def __init__(self, devtype, serial, relay_url=None, bank=None,
-                 power_pin=None, volume_down_pin=None):
+                 power_pin=None, volume_down_pin=None, volume_up_pin=None):
         self.devtype = devtype
         self.serial = serial
         self.relay_url = relay_url
         self.bank = bank
         self.power_pin = power_pin
         self.volume_down_pin = volume_down_pin
+        self.volume_up_pin = volume_up_pin
 
     def get_serial(self):
         return self.serial
@@ -57,10 +58,17 @@
     def reimage_from_fastboot(self):
         #Starting from fastboot mode, put a known-good image on the device
         log.info("Flashing the last stable image")
-        subprocess.check_output(['ubuntu-device-flash', '--serial',
-                                 self.serial, '--channel',
-                                 'ubuntu-touch/stable', '--bootstrap',
-                                 '--password', 'ubuntuci'])
+        if self.devtype == "krillin":
+            subprocess.check_output(['ubuntu-device-flash', '--serial',
+                                     self.serial, '--channel',
+                                     'ubuntu-touch/ubuntu-rtm/14.09-proposed',
+                                     '--bootstrap', '--revision=104',
+                                     '--password', 'ubuntuci'])
+        else:
+            subprocess.check_output(['ubuntu-device-flash', '--serial',
+                                     self.serial, '--channel',
+                                     'ubuntu-touch/stable', '--bootstrap',
+                                     '--password', 'ubuntuci'])
         return self.wait_for_device(600)
 
     def wait_for_fastboot(self, timeout=120):
@@ -125,6 +133,18 @@
         set_relay(self.relay_url, self.bank, self.volume_down_pin, 0)
         set_relay(self.relay_url, self.bank, self.power_pin, 0)
 
+    def _krillin_to_bootloader(self):
+        # On Krillin, the following sequence should take us to fastboot
+        # regardless of the initial state of the device
+        set_relay(self.relay_url, self.bank, self.volume_down_pin, 1)
+        set_relay(self.relay_url, self.bank, self.volume_up_pin, 1)
+        set_relay(self.relay_url, self.bank, self.power_pin, 1)
+        time.sleep(15)
+        set_relay(self.relay_url, self.bank, self.power_pin, 0)
+        time.sleep(6)
+        set_relay(self.relay_url, self.bank, self.volume_down_pin, 0)
+        set_relay(self.relay_url, self.bank, self.volume_up_pin, 0)
+
 
 # When looking at the relay webUI for the mapping, we consider all
 # ports and banks to start numbering from 0