Merge lp:~sergiusens/phablet-tools/image_updates into lp:phablet-tools

[Sergio Schvezov]

Added image signing and master download and copy to device

[lp:~sergiusens/phablet-tools/image_updates]

140. By Sergio Schvezov on 2013-07-19

Uncomment the downloader.download statement

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/114/rebuild

review: Approve (continuous-integration)

[lp:~sergiusens/phablet-tools/image_updates]

141. By Sergio Schvezov on 2013-07-19

Downloading the right files.

[Stéphane Graber (stgraber)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/115/rebuild

review: Approve (continuous-integration)

=== modified file 'phablet-flash'
--- phablet-flash	2013-07-19 01:33:58 +0000
+++ phablet-flash	2013-07-19 22:57:26 +0000
@@ -357,7 +357,8 @@
             str(json_latest['version'])))
     setup_download_directory(download_dir)
     files = ubuntuimage.download_images(download_dir, json_latest)
-    ubuntu_command_path = create_ubuntu_command_file(download_dir, files)
+    ubuntu_command_path = create_ubuntu_command_file(download_dir,
+        files['updates'])
     return files, ubuntu_command_path
 
 
@@ -365,9 +366,10 @@
                                ubuntu_command_path):
     adb.reboot(recovery=True)
     wipe_device(adb)
-    for entry in files:
-        adb.push(entry['filename'], '/cache/recovery/')
-        adb.push(entry['signame'], '/cache/recovery/')
+    for key in files:
+        for entry in files[key]:
+            adb.push(entry['filename'], '/cache/recovery/')
+            adb.push(entry['signame'], '/cache/recovery/')
     adb.push(ubuntu_command_path, '/cache/recovery/ubuntu_command')
     adb.reboot(bootloader=True)
     fastboot.flash('recovery', recovery_img)

=== modified file 'phabletutils/downloads.py'
--- phabletutils/downloads.py	2013-07-11 03:26:21 +0000
+++ phabletutils/downloads.py	2013-07-19 22:57:26 +0000
@@ -25,7 +25,8 @@
 def download(uri, target):
     '''Downloads an artifact into target.'''
     log.info('Downloading %s' % uri)
-    if uri.startswith('http://cdimage.ubuntu.com'):
+    if uri.startswith('http://cdimage.ubuntu.com') or \
+       uri.startswith('https://system-image.ubuntu.com'):
         subprocess.check_call(['wget', '-c', uri, '-O', target])
     else:
         subprocess.check_call(['curl', '-L', '-C', '-', uri, '-o', target])

=== modified file 'phabletutils/ubuntuimage.py'
--- phabletutils/ubuntuimage.py	2013-07-19 01:32:59 +0000
+++ phabletutils/ubuntuimage.py	2013-07-19 22:57:26 +0000
@@ -33,7 +33,8 @@
 
 
 def download_images(download_dir, json_list):
-    files = []
+    files = {}
+    files['updates'] = []
     for entry in sorted(json_list['files'], key=lambda entry: entry['order']):
         filename = entry['path'].split("/")[-1]
         signame = entry['signature'].split("/")[-1]
@@ -41,8 +42,20 @@
         signame_path = os.path.join(download_dir, signame)
         filename_uri = '%s/%s' % (settings.system_image_uri, entry['path'])
         signame_uri = '%s/%s' % (settings.system_image_uri, entry['signature'])
-
-        downloads.download(filename_uri, filename_path)
-        downloads.download(signame_uri, signame_path)
-        files.append({'filename': filename_path, 'signame': signame_path})
+        downloads.download(filename_uri, filename_path)
+        downloads.download(signame_uri, signame_path)
+        files['updates'].append({'filename': filename_path, 
+            'signame': signame_path})
+    files['base'] = []
+    for keyring in ('image-master', 'image-signing'):
+        filename = '%s.tar.xz' % keyring
+        signame = '%s.asc' % filename
+        filename_path = os.path.join(download_dir, filename)
+        signame_path = os.path.join(download_dir, signame)
+        filename_uri = '%s/gpg/%s' % (settings.system_image_uri, filename)
+        signame_uri = '%s.asc' % filename_uri
+        downloads.download(filename_uri, filename_path)
+        downloads.download(signame_uri, signame_path)
+        files['base'].append({'filename': filename_path, 
+            'signame': signame_path})
     return files