Merge lp:~fginther/core-image-publisher/edge-support into lp:core-image-publisher

[Francis Ginther]

Add support for release and ubuntu-device-flash 0.20snappy7-0ubuntu1.

The fix_permission thing is a bit troubling to me. But ubuntu-device-flash leaves behind a .gnupg directory in the same location where the image is downloaded that is owned by root:root.

Add support for release and ubuntu-device-flash 0.20snappy7-0ubuntu1.

[Celso Providelo (cprov)]

Francis,

It think the needs of sudo, thus the mis-assigned permission to .gnupg is a u-d-f problem and should be confined to the stage where it's is called (download_image function).

What do you think about chaining a check_call('sudo rm -rf .gnupg') after the image is downloaded ?

review: Needs Information

[Francis Ginther (fginther)]

> Francis,
>
> It think the needs of sudo, thus the mis-assigned permission to .gnupg is a
> u-d-f problem and should be confined to the stage where it's is called
> (download_image function).
>
> What do you think about chaining a check_call('sudo rm -rf .gnupg') after the
> image is downloaded ?

Lemme try.

[Francis Ginther (fginther)]

Rejecting as a different solution was implemented that only required modifications to the publisher.

Unmerged revisions

28. By Francis Ginther on 2015-04-22

Add support for release and ubuntu-device-flash 0.20snappy7-0ubuntu1.

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-04-08 20:14:12 +0000
+++ core_image_publisher/worker.py	2015-04-22 19:38:00 +0000
@@ -17,6 +17,7 @@
 
 """Business logic or the service lives here."""
 
+import getpass
 import logging
 import os
 import subprocess
@@ -45,6 +46,7 @@
         extra.update(payload)
         try:
             image_name = payload['image_name']
+            release = payload['release']
             channel = payload['channel']
             device = payload['device']
         except KeyError as e:
@@ -61,6 +63,7 @@
             try:
                 image_path = download_image(
                     image_name,
+                    release,
                     channel,
                     device,
                     tmpdir
@@ -75,6 +78,15 @@
             logger.info("Ubuntu Core image downloaded OK.", extra=extra)
 
             try:
+                fix_permissions(tmpdir)
+            except subprocess.CalledProcessError as e:
+                logger.error(
+                    "Unable to fix permissions on %s",
+                    e,
+                    extra=extra)
+                return MessageActions.Retry
+
+            try:
                 nova_image_path = convert_nova_image(image_path)
             except subprocess.CalledProcessError as e:
                 logger.error(
@@ -106,7 +118,7 @@
         return MessageActions.Acknowledge
 
 
-def download_image(name, channel, device, tmpdir):
+def download_image(name, release, channel, device, tmpdir):
     """Download the ubuntu code image, return a path to it on disk."""
     image_path = os.path.join(tmpdir, 'core-{}.img'.format(name))
     udf_env = {
@@ -124,11 +136,25 @@
            '--size', '3',
            '-o', image_path,
            '--developer-mode',
-           '--cloud']
+           '--cloud',
+           release]
+    logger.info("ubuntu-device-flash: %s", cmd)
     check_call(cmd, env=udf_env)
     return image_path
 
 
+def fix_permissions(tmpdir):
+    """
+    Fix the permissions of the files left behind by ubuntu-device-flash.
+    """
+    cmd = ['sudo',
+           'chown',
+           '-R',
+           getpass.getuser(),
+           tmpdir]
+    check_call(cmd)
+
+
 def convert_nova_image(image_path):
     """
     Convert a core image to a nova image, return path to the converted image.