Merge lp:~vila/ubuntu-test-cases/boottest into lp:~canonical-ci-engineering/ubuntu-test-cases/boottest

[Vincent Ladeuil]

Reconcile the boottest branch by merging lp:~ubuntu-test-case-dev/ubuntu-test-cases/touch to get the krillin recovery handling and krillin-11 -> krillin-15 declarations

[Para Siva (psivaa)]

Thanks for spotting this, the main ubuntu-test-cases/touch does provision the device properly. I assume merging this would not cause any boottest specific issues, if there were any tweaks made for that. But we could deal with it as and when they arise.
Thanks again.
+1

review: Approve

=== modified file 'jenkins/testconfig.py'
--- jenkins/testconfig.py	2014-11-20 17:28:52 +0000
+++ jenkins/testconfig.py	2015-02-11 10:52:47 +0000
@@ -59,6 +59,7 @@
     APTest('unity8-autopilot', 'unity8'),
     APTest('camera-app-autopilot'),
     APTest('dialer-app-autopilot', pkgs=['dialer-app-autopilot']),
+    APTest('ubuntu-keyboard-autopilot', pkgs=['ubuntu-keyboard-autopilot']),
     APTest('messaging-app-autopilot', pkgs=['messaging-app-autopilot']),
     APTest('address-book-app-autopilot', pkgs=['address-book-app-autopilot']),
     APTest('reminders-autopilot',
 
=== modified file 'scripts/device_info.py'
--- scripts/device_info.py	2015-01-27 03:37:14 +0000
+++ scripts/device_info.py	2015-02-11 10:52:47 +0000
@@ -1,9 +1,13 @@
 #!/usr/bin/env python
 
 import logging
+import os
 import re
+import requests
 import subprocess
+import sys
 import time
+import urlparse
 
 from ncd_usb import set_relay
 
@@ -57,12 +61,27 @@
 
     def reimage_from_fastboot(self):
         #Starting from fastboot mode, put a known-good image on the device
+        recovery_base = 'http://people.canonical.com/~plars/touch'
+        recovery_img = 'recovery-{}.img'.format(self.devtype)
+        recovery_url = os.path.join(recovery_base, recovery_img)
+        # For certain devices, we need to first pull an alternate
+        # recovery image that has adb enabled. If it's needed, it will
+        # be at that url, otherwise we don't even try to use it.
+        if not os.path.exists(os.path.join('recovery', recovery_img)):
+            try:
+                _download(recovery_url, 'recovery')
+            except:
+                # Don't fail for any reason, if attempt to flash without
+                pass
+        udf_command = ['ubuntu-device-flash', 'touch', '--serial',
+                       self.serial, '--channel', 'ubuntu-touch/stable',
+                       '--bootstrap', '--developer-mode',
+                       '--password', '0000']
+        if os.path.exists(os.path.join('recovery', recovery_img)):
+            udf_command.extend(['--recovery-image',
+                                os.path.join('recovery', recovery_img)])
         log.info("Flashing the last stable image")
-        subprocess.check_output(['ubuntu-device-flash', 'touch', '--serial',
-                                 self.serial, '--channel',
-                                 'ubuntu-touch/stable', '--bootstrap',
-                                 '--developer-mode',
-                                 '--password', '0000'])
+        subprocess.check_output(udf_command)
         return self.wait_for_device(600)
 
     def wait_for_fastboot(self, timeout=120):
@@ -108,6 +127,9 @@
     def force_bootloader(self):
         bootloader_func = getattr(
             self, '_{}_to_bootloader'.format(self.devtype))
+        if not self.relay_url:
+            log.error("Device cannot be recovered, no relay data exists!")
+            sys.exit(-1)
         if bootloader_func and callable(bootloader_func):
             bootloader_func()
         else:
@@ -185,6 +207,11 @@
                               relay_url="http://decatur.ubuntu-ci",
                               bank=2, power_pin=0, volume_up_pin=1,
                               volume_down_pin=2),
+    "krillin-11": TouchDevice("krillin", "JB072312"),
+    "krillin-12": TouchDevice("krillin", "JB071487"),
+    "krillin-13": TouchDevice("krillin", "JB044235"),
+    "krillin-14": TouchDevice("krillin", "JB072205"),
+    "krillin-15": TouchDevice("krillin", "JB071743"),
     "ps-mako-01": TouchDevice("mako", "0090f741e3d141bc"),
     "ps-mako-02": TouchDevice("mako", "04ccca120acd4dea"),
     "ps-mako-03": TouchDevice("mako", "04cb53b598546534"),
@@ -256,3 +283,21 @@
 def get_device(name):
     # This raises KeyError if we don't have any record of that device
     return DEVICES[name]
+
+
+def _download(url, path):
+    os.makedirs(path)
+    urlpath = urlparse.urlsplit(url).path
+    filename = os.path.basename(urlpath)
+    filename = os.path.join(path, filename)
+
+    response = requests.get(url, stream=True)
+    response.raise_for_status()
+    with open(filename, 'wb') as f:
+        for chunk in response.iter_content(chunk_size=64 * 1024):
+            # Ignore keep-alives
+            if not chunk:
+                continue
+            f.write(chunk)
+            f.flush()
+    return filename
 
=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2014-11-17 15:52:10 +0000
+++ scripts/provision.sh	2015-02-11 10:52:47 +0000
@@ -8,6 +8,7 @@
 export PATH=${BASEDIR}/../utils/host:${PATH}
 
 RESDIR=`pwd`/clientlogs
+RECOVERY_URL="http://people.canonical.com/~plars/touch"
 
 NETWORK_FILE="${NETWORK_FILE-${HOME}/.ubuntu-ci/wifi.conf}"
 
@@ -118,6 +119,7 @@
 
 full_flash() {
 	log "FLASHING DEVICE"
+	DEVICE_TYPE=$(get-device-type)
 	# Use a 60 second retry loop for reboot_bootloader.
 	# If the attempt failed, it may take nearly 60 seconds to complete
 	# the reboot cycle to get the device back to a sane state.
@@ -125,7 +127,15 @@
 	# Use a 10 second retry loop for ubuntu-device-flash.
 	# Most failures appear to be transient and work with an immediate
 	# retry.
-	retry 10 3 timeout 1800 ubuntu-device-flash ${REVISION} touch --password $PHABLET_PASSWORD $IMAGE_OPT
+	RECOVERY=""
+	mkdir -p recovery
+	log "The following wget is only needed for some devices. If it fails, it's probably safe to ignore"
+	wget -P recovery \
+		${RECOVERY_URL}/recovery-${DEVICE_TYPE}.img || /bin/true
+        if [ -f recovery/recovery-${DEVICE_TYPE}.img ]; then
+		RECOVERY="--recovery-image=recovery/recovery-${DEVICE_TYPE}.img"
+	fi
+	retry 10 3 timeout 1800 ubuntu-device-flash ${REVISION} touch ${RECOVERY} --password $PHABLET_PASSWORD $IMAGE_OPT
 	adb wait-for-device
 	sleep 60  #give the system a little time
 }
 
=== added file 'utils/host/get-device-type'
--- utils/host/get-device-type	1970-01-01 00:00:00 +0000
+++ utils/host/get-device-type	2015-02-11 10:52:47 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import os
+from phabletutils.environment import detect_device
+
+device_type = os.environ.get('DEVICE_TYPE')
+if device_type is None:
+    device_type = detect_device(None)
+print(device_type)