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

[Sergio Schvezov]

Separating Ubuntu Image Based Upgrade downloads into specific device download directories

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

167. By Sergio Schvezov on 2013-08-22

Using a clear namespace separation for each download based on the server indexes.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

Looks good. Thanks!

review: Approve

[Ricardo Salveti (rsalveti)]

Looks fine, tested and worked as expected.

review: Approve

=== modified file 'phabletutils/cdimage.py'
--- phabletutils/cdimage.py	2013-08-05 18:15:30 +0000
+++ phabletutils/cdimage.py	2013-08-22 22:26:28 +0000
@@ -22,6 +22,7 @@
 import urlparse
 
 from phabletutils import hashes
+from phabletutils import fileutils
 from phabletutils import resources
 from phabletutils import settings
 
@@ -122,15 +123,20 @@
 
 def get_file(file_key, series, download_dir, project='ubuntu-touch',
              device=None):
-    uri = '%s/%s/daily-preinstalled/current' % (
-        settings.cdimage_uri_base, project)
-    hash_dict = hashes.load_hash(uri, 'SHA256SUMS')
+    uri = '%s/%s/daily-preinstalled' % (settings.cdimage_uri_base, project)
+    build = get_build(uri)
+    hash_dict = hashes.load_hash('%s/%s' % (uri, build), 'SHA256SUMS')
     if device:
         file_name = settings.files_arch_any[project][file_key] %\
             (series, device)
+        download_dir = fileutils.create_path(
+            download_dir, os.path.join(device, build))
     else:
         file_name = settings.files_arch_all[project][file_key] % series
+        download_dir = fileutils.create_path(
+            download_dir, build)
+    log.debug('Download dir for %s set to %s' % (file_name, download_dir))
     return resources.File(
         file_path=os.path.join(download_dir, file_name),
-        file_uri='%s/%s' % (uri, file_name),
+        file_uri='%s/%s/%s' % (uri, build, file_name),
         file_hash=hash_dict[file_name])

=== modified file 'phabletutils/environment.py'
--- phabletutils/environment.py	2013-08-15 15:33:44 +0000
+++ phabletutils/environment.py	2013-08-22 22:26:28 +0000
@@ -204,7 +204,7 @@
     else:
         raise EnvironmentError('Specific version retrieve not supported yet')
     download_dir = downloads.get_full_path(os.path.join(
-        settings.download_dir, args.project, str(json['version'])))
+        settings.download_dir, args.project))
     uri = settings.system_image_uri
     files, command_part = ubuntuimage.get_files(download_dir, uri, json)
     recovery = cdimage.get_file(file_key='recovery_img',

=== added file 'phabletutils/fileutils.py'
--- phabletutils/fileutils.py	1970-01-01 00:00:00 +0000
+++ phabletutils/fileutils.py	2013-08-22 22:26:28 +0000
@@ -0,0 +1,50 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright (C) 2013 Canonical Ltd.
+# Author: Sergio Schvezov <[e-mail]>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import atexit
+import logging
+import os.path
+import shutil
+import tempfile
+
+
+log = logging.getLogger()
+
+
+def cleanup(directory):
+    if os.path.exists(directory) and os.path.isdir(directory):
+        print('Removing directory %s' % directory)
+        shutil.rmtree(directory)
+
+
+def create_temp_dir():
+    directory = tempfile.mkdtemp()
+    atexit.register(cleanup, directory)
+    return directory
+
+
+def create_path(directory, subdir):
+    directory = os.path.join(directory, subdir)
+    if not os.path.exists(directory):
+        log.debug('Creating directory %s' % directory)
+        try:
+            os.makedirs(directory)
+        except OSError as e:
+            if e.errno == 17:
+                pass
+            else:
+                raise e
+    return directory

=== modified file 'phabletutils/ubuntuimage.py'
--- phabletutils/ubuntuimage.py	2013-08-14 05:57:43 +0000
+++ phabletutils/ubuntuimage.py	2013-08-22 22:26:28 +0000
@@ -18,6 +18,7 @@
 import os.path
 
 from phabletutils import downloads
+from phabletutils import fileutils
 from phabletutils import resources
 from phabletutils import settings
 
@@ -44,20 +45,25 @@
     for entry in sorted(json['files'], key=lambda entry: entry['order']):
         filename = entry['path'].split("/")[-1]
         signame = entry['signature'].split("/")[-1]
+        paths = {}
+        for path in ('path', 'signature'):
+            paths[path] = fileutils.create_path(
+                download_dir, os.path.dirname(entry[path].strip(os.path.sep)))
         f = resources.SignedFile(
-            file_path=os.path.join(download_dir, filename),
-            sig_path=os.path.join(download_dir, signame),
+            file_path=os.path.join(paths['path'], filename),
+            sig_path=os.path.join(paths['signature'], signame),
             file_uri='%s%s' % (uri, entry['path']),
             sig_uri='%s%s' % (uri, entry['signature']),
             file_hash=entry['checksum'])
         files.append(f)
         command_part += 'update %s %s\n' % (filename, signame)
+    gpg_download_dir = fileutils.create_temp_dir()
     for keyring in ('image-master', 'image-signing'):
         filename = '%s.tar.xz' % keyring
         signame = '%s.asc' % filename
         f = resources.SignedFile(
-            file_path=os.path.join(download_dir, filename),
-            sig_path=os.path.join(download_dir, signame),
+            file_path=os.path.join(gpg_download_dir, filename),
+            sig_path=os.path.join(gpg_download_dir, signame),
             file_uri='%s/gpg/%s' % (uri, filename),
             sig_uri='%s/gpg/%s.asc' % (uri, filename),
             file_hash=None)